cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [2/5] cxf git commit: PMD fix
Date Fri, 04 Dec 2015 17:12:38 GMT
PMD fix


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

Branch: refs/heads/3.0.x-fixes
Commit: 596a373908834c80a19e8d5c6c9a32966138186c
Parents: dae28f0
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Dec 4 16:38:21 2015 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Dec 4 17:11:41 2015 +0000

----------------------------------------------------------------------
 .../apache/cxf/rs/security/oauth2/common/OAuthPermission.java   | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/596a3739/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java
index f23e2ad..88a2ad6 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java
@@ -170,10 +170,7 @@ public class OAuthPermission extends Permission {
             || this.description != null && !this.description.equals(that.description))
{
             return false;
         }
-        if (this.invisibleToClient != that.invisibleToClient) {
-            return false;
-        }
-        if (this.isDefault != that.isDefault) {
+        if (this.invisibleToClient != that.invisibleToClient || this.isDefault != that.isDefault)
{ //NOPMD
             return false;
         }
         


Mime
View raw message