cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [1/2] cxf git commit: Don't write out the permission name if it's null
Date Thu, 10 Dec 2015 16:58:12 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 261dde403 -> dc1a867f9


Don't write out the permission name if it's null


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

Branch: refs/heads/3.1.x-fixes
Commit: 4748548f2d7a88869affef9b4df3197f461604e9
Parents: 261dde4
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Thu Dec 10 12:44:20 2015 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Thu Dec 10 16:51:52 2015 +0000

----------------------------------------------------------------------
 .../java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/4748548f/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java
index 0db2313..4974760 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java
@@ -136,7 +136,9 @@ public final class OAuthUtils {
             if (sb.length() > 0) {
                 sb.append(" ");
             }
-            sb.append(perm.getPermission());
+            if (perm.getPermission() != null) {
+                sb.append(perm.getPermission());
+            }
         }
         return sb.toString();
     }


Mime
View raw message