PMD fix
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5c05f1c0 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5c05f1c0 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5c05f1c0 Branch: refs/heads/3.1.x-fixes Commit: 5c05f1c06e9b2d71eb2e85128ef4e2d9978ec17f Parents: b7d3336 Author: Colm O hEigeartaigh <[email protected]> Authored: Fri Dec 4 16:38:21 2015 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Fri Dec 4 17:04:12 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/5c05f1c0/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; }
