cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [3/3] cxf git commit: PMD fix
Date Fri, 04 Dec 2015 16:38:35 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/aaabd57f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/aaabd57f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/aaabd57f

Branch: refs/heads/master
Commit: aaabd57fb537feda5c5243168734fe331c995926
Parents: 8583a24
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 16:38:21 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/aaabd57f/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 2b31fa8..43aeb64 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
@@ -174,10 +174,7 @@ public class OAuthPermission implements Serializable {
             || 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