cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [3/3] cxf git commit: Fixing merge
Date Fri, 12 May 2017 12:24:49 GMT
Fixing merge


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

Branch: refs/heads/3.1.x-fixes
Commit: 0643b5aa2293cbc68e16c90ac9484ac63ff81aaf
Parents: 97f9a50
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri May 12 13:24:40 2017 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri May 12 13:24:40 2017 +0100

----------------------------------------------------------------------
 .../java/org/apache/cxf/sts/operation/AbstractOperation.java    | 5 -----
 1 file changed, 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/0643b5aa/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
index 8e853d1..733d909 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
@@ -583,13 +583,8 @@ public abstract class AbstractOperation {
         if (responsePrincipal != null) {
             String targetRealm = providerParameters.getRealm();
             String sourceRealm = tokenResponse.getTokenRealm();
-<<<<<<< HEAD
-    
-            if (sourceRealm != null && !sourceRealm.equals(targetRealm)) {
-=======
 
             if (sourceRealm != null && targetRealm != null && !sourceRealm.equals(targetRealm))
{
->>>>>>> a71508214a... Only map principals when both realms are non-null
                 RelationshipResolver relRes = stsProperties.getRelationshipResolver();
                 Relationship relationship = null;
                 if (relRes != null) {


Mime
View raw message