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 Thu, 03 Aug 2017 13:21:05 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/963576b4
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/963576b4
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/963576b4

Branch: refs/heads/3.1.x-fixes
Commit: 963576b458fd9ee7bff3d38ce7a751d00ee68b3a
Parents: 484811f
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Thu Aug 3 14:20:54 2017 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Thu Aug 3 14:20:54 2017 +0100

----------------------------------------------------------------------
 .../cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java       | 4 ----
 1 file changed, 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/963576b4/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java
index 36d777a..6037934 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java
@@ -154,12 +154,8 @@ public class SAMLSSOResponseValidator {
         Element clonedAssertionElement = (Element)assertionElement.cloneNode(true);
         validatorResponse.setAssertionElement(clonedAssertionElement);
         validatorResponse.setAssertion(DOM2Writer.nodeToString(clonedAssertionElement));
-<<<<<<< HEAD
-        
-=======
         validatorResponse.setOpensamlAssertion(validAssertion);
 
->>>>>>> 530498a452... Also return the Assertion that was validated
         return validatorResponse;
     }
     


Mime
View raw message