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:10:18 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 92b2da359 -> ae4cc1460


Fixing merge


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

Branch: refs/heads/3.0.x-fixes
Commit: ae4cc1460da0e5e0fd8814669c0168f99489baac
Parents: 92b2da3
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:10:09 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/ae4cc146/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