You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2016/09/16 01:36:57 UTC
[06/22] cxf git commit: Fixing a typo in the OAuth2 config service
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/5eb67e15
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5eb67e15
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5eb67e15
Branch: refs/heads/master-jaxrs-2.1
Commit: 5eb67e15938ece67e7a0f518d05b1ff653690f0f
Parents: f7f017f
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Wed Sep 14 13:52:31 2016 +0100
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Wed Sep 14 13:52:31 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/5eb67e15/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 {