From 121cbead32d3155ebb1797aff4a870c54696984e Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Tue, 18 Jun 2013 10:11:41 +0200 Subject: [PATCH 1/3] Fix NullPointerException when comparing AccessSections AccessSection.permissions and Permission.rules may not be set and null values should be handled in the equals methods. We saw this NPE when PermissionCollection tried to sort the access sections. Change-Id: I6f5a0886e6f9e5498fe9d756f289c5e91ed3485e Signed-off-by: Edwin Kempin (cherry picked from commit 915104def3969fe5153bdc1e3e22f007483ff1aa) --- .../java/com/google/gerrit/common/data/AccessSection.java | 4 ++-- .../main/java/com/google/gerrit/common/data/Permission.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/AccessSection.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/AccessSection.java index a9b5e85503..5ddf1ae249 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/data/AccessSection.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/AccessSection.java @@ -124,7 +124,7 @@ public class AccessSection extends RefConfigSection implements if (!super.equals(obj) || !(obj instanceof AccessSection)) { return false; } - return new HashSet(permissions).equals(new HashSet( - ((AccessSection) obj).permissions)); + return new HashSet(getPermissions()).equals(new HashSet( + ((AccessSection) obj).getPermissions())); } } diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/Permission.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/Permission.java index 0585651098..43fefba481 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/data/Permission.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/Permission.java @@ -241,8 +241,8 @@ public class Permission implements Comparable { if (!name.equals(other.name) || exclusiveGroup != other.exclusiveGroup) { return false; } - return new HashSet(rules) - .equals(new HashSet(other.rules)); + return new HashSet(getRules()) + .equals(new HashSet(other.getRules())); } @Override From 049873f7debb256502fbb2f8ae8547bafd561dc3 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Tue, 9 Jul 2013 09:20:55 +0900 Subject: [PATCH 2/3] Release notes for Gerrit 2.6.2 Change-Id: I601b56793f265603d608bc397f386d35c0cdf3b8 --- ReleaseNotes/ReleaseNotes-2.6.2.txt | 43 +++++++++++++++++++++++++++++ ReleaseNotes/index.txt | 1 + 2 files changed, 44 insertions(+) create mode 100644 ReleaseNotes/ReleaseNotes-2.6.2.txt diff --git a/ReleaseNotes/ReleaseNotes-2.6.2.txt b/ReleaseNotes/ReleaseNotes-2.6.2.txt new file mode 100644 index 0000000000..cf963c243f --- /dev/null +++ b/ReleaseNotes/ReleaseNotes-2.6.2.txt @@ -0,0 +1,43 @@ +Release notes for Gerrit 2.6.2 +============================== + +Gerrit 2.6.2 is now available: + +link:https://gerrit-releases.storage.googleapis.com/gerrit-2.6.2.war[ +https://gerrit-releases.storage.googleapis.com/gerrit-2.6.2.war] + +There are no schema changes from 2.6.1. + +However, if upgrading from a version older than 2.6, follow the upgrade +procedure in the 2.6 link:ReleaseNotes-2.6.html[Release Notes]. + + +Bug Fixes +--------- + + +* Fix null-pointer exception when dashboard title is not specified. ++ +If the title is not specified, the path of the dashboard config file +is used as title. + +* link:https://code.google.com/p/gerrit/issues/detail?id=2010[Issue 2010]: +Fix null-pointer exception when searching for changes with the query +`owner:self`. + +* Properly handle double-click on external group in GroupTable. ++ +Double-clicking on an external group opens the group's URL (if it +is provided). + +* link:https://code.google.com/p/gerrit/issues/detail?id=1872[Issue 1872]: +Fix tab expansion in diff screens when syntax coloring is on. + +* link:https://code.google.com/p/gerrit/issues/detail?id=1904[Issue 1904]: +Fix diff screens for files with CRLF line endings. + +* Allow label values to be configured with no text. + + +No other changes since 2.6.1. + diff --git a/ReleaseNotes/index.txt b/ReleaseNotes/index.txt index 98cc3ac51d..3f9ed7c1c6 100644 --- a/ReleaseNotes/index.txt +++ b/ReleaseNotes/index.txt @@ -4,6 +4,7 @@ Gerrit Code Review - Release Notes [[2_6]] Version 2.6.x ------------- +* link:ReleaseNotes-2.6.2.html[2.6.2] * link:ReleaseNotes-2.6.html[2.6] [[2_5]] From da062b0bec1ace0311ee49f586561474d32cddd4 Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Tue, 6 Aug 2013 08:28:16 +0200 Subject: [PATCH 3/3] Say in gsql documentation that 'Access Database' capability is required Since abd6d4e1d4ac11b7478c00289258a462d8544a24 the 'Access Database' capability is required to run the gsql command. Change-Id: I39b2b22be975172839ab9808649afcfc58994806 Signed-off-by: Edwin Kempin --- Documentation/cmd-gsql.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/cmd-gsql.txt b/Documentation/cmd-gsql.txt index b53670b368..7ddc41f67e 100644 --- a/Documentation/cmd-gsql.txt +++ b/Documentation/cmd-gsql.txt @@ -32,7 +32,9 @@ OPTIONS ACCESS ------ -Caller must be a member of the privileged 'Administrators' group. +Caller must have been granted the +link:access-control.html#capability_accessDatabase[Access Database] +global capability. SCRIPTING ---------