You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2016/02/24 18:01:53 UTC

[5/5] cxf-fediz git commit: Minor changes

Minor changes


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

Branch: refs/heads/master
Commit: c436aa7b0a9e853124e692488018b32267466841
Parents: 9375d3e
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Feb 24 17:01:35 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Feb 24 17:01:35 2016 +0000

----------------------------------------------------------------------
 .../main/java/org/apache/cxf/fediz/service/idp/domain/Idp.java   | 4 ++--
 systests/federation/oidc/src/test/resources/entities-realma.xml  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/c436aa7b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/domain/Idp.java
----------------------------------------------------------------------
diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/domain/Idp.java b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/domain/Idp.java
index f19cac8..d382184 100644
--- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/domain/Idp.java
+++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/domain/Idp.java
@@ -210,7 +210,7 @@ public class Idp implements Serializable {
 
     public Application findApplication(String realmApplication) {
         for (Application item : applications) {
-            if (realmApplication.equals(item.getRealm())) {
+            if (item.getRealm().equals(realmApplication)) {
                 return item;
             }
         }
@@ -229,7 +229,7 @@ public class Idp implements Serializable {
 
     public TrustedIdp findTrustedIdp(String realmTrustedIdp) {
         for (TrustedIdp item : trustedIdpList) {
-            if (realmTrustedIdp.equals(item.getRealm())) {
+            if (item.getRealm().equals(realmTrustedIdp)) {
                 return item;
             }
         }

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/c436aa7b/systests/federation/oidc/src/test/resources/entities-realma.xml
----------------------------------------------------------------------
diff --git a/systests/federation/oidc/src/test/resources/entities-realma.xml b/systests/federation/oidc/src/test/resources/entities-realma.xml
index 54a2855..43c36ef 100644
--- a/systests/federation/oidc/src/test/resources/entities-realma.xml
+++ b/systests/federation/oidc/src/test/resources/entities-realma.xml
@@ -100,6 +100,7 @@
         <property name="parameters">
             <util:map>
                 <entry key="client.id" value="consumer-id"/>
+                <entry key="client.secret" value="90d5da25-e900-443f-a5d5-feb3bb060800"/>
                 <entry key="token.endpoint" value="http://localhost:8080/auth/realms/realmb/protocol/openid-connect/token"/>
             </util:map>
         </property>