cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject cxf git commit: Fixing merge
Date Sat, 05 Dec 2015 10:06:17 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 85a45a8bc -> 14b70012f


Fixing merge


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/14b70012
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/14b70012
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/14b70012

Branch: refs/heads/3.1.x-fixes
Commit: 14b70012f059e6bebdc1d3fab6104d7069a1b5d4
Parents: 85a45a8
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Sat Dec 5 10:06:05 2015 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Sat Dec 5 10:06:05 2015 +0000

----------------------------------------------------------------------
 .../org/apache/cxf/rs/security/oauth2/common/Permission.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/14b70012/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Permission.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Permission.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Permission.java
index 6d293e5..8371981 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Permission.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Permission.java
@@ -137,8 +137,8 @@ public class Permission implements Serializable {
         if (description != null) {
             hashCode = 31 * hashCode + description.hashCode();
         }
-        hashCode = 31 * hashCode + Boolean.hashCode(invisibleToClient);
-        hashCode = 31 * hashCode + Boolean.hashCode(isDefault);
+        hashCode = 31 * hashCode + Boolean.valueOf(invisibleToClient).hashCode();
+        hashCode = 31 * hashCode + Boolean.valueOf(isDefault).hashCode();
         
         return hashCode;
     }


Mime
View raw message