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 2017/05/12 12:24:47 UTC
[1/3] cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 8b749956b -> 0643b5aa2
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/97f9a50b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/97f9a50b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/97f9a50b
Branch: refs/heads/3.1.x-fixes
Commit: 97f9a50b457cd8aaa8c256d2a4481e4240fab39f
Parents: 2b7d420
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri May 12 13:24:25 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri May 12 13:24:25 2017 +0100
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/97f9a50b/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 1d12f5b..faa0409 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -507,6 +507,7 @@ M a2efc18eff09700eded186478a7c2ae8fa543eef
M a304f27b8ad9da04dde3610932266c64baa3aa7e
M a42362e397b84d335015f7f9aa07b4f0bfb49260
M a644c5d06c0bae321e2c669efa0cecf3abdd944d
+M a71508214a7682c6a569075b1395f387c31be63b
M a719adccae8500f2d7e7140a9f4cd26e20775818
M a7d5d525c05cf10a6ae12c25645c248d92dfac1c
M a89ca98653b95bcd2ab5cadbe9a419a4cec4893a
[3/3] cxf git commit: Fixing merge
Posted by co...@apache.org.
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 <co...@apache.org>
Authored: Fri May 12 13:24:40 2017 +0100
Committer: Colm O hEigeartaigh <co...@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) {
[2/3] cxf git commit: Only map principals when both realms are
non-null
Posted by co...@apache.org.
Only map principals when both realms are non-null
# Conflicts:
# services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2b7d4200
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2b7d4200
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2b7d4200
Branch: refs/heads/3.1.x-fixes
Commit: 2b7d42009eebfdf3005540e5621746f95786c151
Parents: 8b74995
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri May 12 13:23:54 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri May 12 13:24:25 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/cxf/sts/operation/AbstractOperation.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/2b7d4200/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 0b48b5c..8e853d1 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,8 +583,13 @@ 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) {
@@ -618,7 +623,7 @@ public abstract class AbstractOperation {
// principal remains unchanged
} else {
- LOG.log(Level.SEVERE, "Unkown federation type: " + relationship.getType());
+ LOG.log(Level.SEVERE, "Unknown federation type: " + relationship.getType());
throw new STSException("Error in providing a token", STSException.BAD_REQUEST);
}
}