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 Tue, 04 Apr 2017 13:01:27 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/d3f90875
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d3f90875
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d3f90875

Branch: refs/heads/3.1.x-fixes
Commit: d3f9087516e7179a356bae8b8fb642ce6a89c3b6
Parents: d4ef049
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Tue Apr 4 14:01:19 2017 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Tue Apr 4 14:01:19 2017 +0100

----------------------------------------------------------------------
 .../org/apache/cxf/systest/sts/custom/CustomParameterTest.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/d3f90875/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomParameterTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomParameterTest.java
b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomParameterTest.java
index a4219fe..a604507 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomParameterTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomParameterTest.java
@@ -385,10 +385,11 @@ public class CustomParameterTest extends AbstractBusClientServerTestBase
{
         Crypto crypto = CryptoFactory.getInstance("serviceKeystore.properties");
         requestData.setDecCrypto(crypto);
         requestData.setSigVerCrypto(crypto);
-        requestData.setWsDocInfo(new WSDocInfo(assertionElement.getOwnerDocument()));
 
         Processor processor = new SAMLTokenProcessor();
-        return processor.handleToken(assertionElement, requestData);
+        return processor.handleToken(
+            assertionElement, requestData, new WSDocInfo(assertionElement.getOwnerDocument())
+        );
     }
 
     private static void doubleIt(DoubleItPortType port, int numToDouble) {


Mime
View raw message