cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: Fixing a typo in the OAuth2 config service
Date Wed, 14 Sep 2016 12:53:40 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 2624d5dd7 -> 5072be969


Fixing a typo in the OAuth2 config service


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

Branch: refs/heads/3.1.x-fixes
Commit: 5072be96989b8617cb4fcf88ecad69fa324349c7
Parents: 2624d5d
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Wed Sep 14 13:52:31 2016 +0100
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Wed Sep 14 13:53:15 2016 +0100

----------------------------------------------------------------------
 .../rs/security/oauth2/services/AuthorizationMetadataService.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/5072be96/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
index cfd566b..97c7a53 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
@@ -46,6 +46,7 @@ public class AuthorizationMetadataService {
         prepareConfigurationData(cfg, baseUri);
         
         JsonMapObjectReaderWriter writer = new JsonMapObjectReaderWriter();
+        writer.setFormat(true);
         return writer.toJson(cfg);
     }
     
@@ -71,7 +72,7 @@ public class AuthorizationMetadataService {
     }
 
     protected static String calculateEndpointAddress(String endpointAddress, String baseUri,
String defRelAddress) {
-        endpointAddress = endpointAddress == null ? endpointAddress : defRelAddress;
+        endpointAddress = endpointAddress != null ? endpointAddress : defRelAddress;
         if (endpointAddress.startsWith("https")) {
             return endpointAddress;
         } else {


Mime
View raw message