You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2011/02/23 17:44:33 UTC
svn commit: r1073819 - in /cxf/branches/2.3.x-fixes: ./
rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Proxy.java
systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
Author: dkulp
Date: Wed Feb 23 16:44:32 2011
New Revision: 1073819
URL: http://svn.apache.org/viewvc?rev=1073819&view=rev
Log:
Merged revisions 1073118 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1073118 | dkulp | 2011-02-21 14:09:08 -0500 (Mon, 21 Feb 2011) | 1 line
Fix test failure in SequenceTest
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Proxy.java
cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Proxy.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Proxy.java?rev=1073819&r1=1073818&r2=1073819&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Proxy.java (original)
+++ cxf/branches/2.3.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Proxy.java Wed Feb 23 16:44:32 2011
@@ -21,6 +21,7 @@ package org.apache.cxf.ws.rm;
import java.util.Collections;
+import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -186,7 +187,9 @@ public class Proxy {
OperationInfo oi = reliableEndpoint.getEndpoint().getEndpointInfo().getService().getInterface()
.getOperation(RMConstants.getLastMessageOperationName());
// pass reference to source sequence in invocation context
- Map<String, Object> context = Collections.singletonMap(SourceSequence.class.getName(), (Object)s);
+ Map<String, Object> context = new HashMap<String, Object>(
+ Collections.singletonMap(SourceSequence.class.getName(),
+ (Object)s));
invoke(oi, new Object[] {}, context);
}
Modified: cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java?rev=1073819&r1=1073818&r2=1073819&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java (original)
+++ cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java Wed Feb 23 16:44:32 2011
@@ -1246,7 +1246,7 @@ public class SequenceTest extends Abstra
@Test
public void testTerminateOnShutdown() throws Exception {
init("org/apache/cxf/systest/ws/rm/terminate-on-shutdown.xml", true);
-
+
greeter.greetMeOneWay("neutrophil");
greeter.greetMeOneWay("basophil");
greeter.greetMeOneWay("eosinophil");