Author: ay Date: Wed Dec 5 17:19:40 2012 New Revision: 1417536 URL: http://svn.apache.org/viewvc?rev=1417536&view=rev Log: Merged revisions 1417534 via svn merge from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1417534 | ay | 2012-12-05 18:10:56 +0100 (Wed, 05 Dec 2012) | 9 lines Merged revisions 1417531 via svn merge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1417531 | ay | 2012-12-05 18:08:00 +0100 (Wed, 05 Dec 2012) | 1 line [CXF-4678] ConcurrentModificationException from WS-RM's RMOutInterceptor's ack updates ........ ........ Modified: cxf/branches/2.5.x-fixes/ (props changed) cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Destination.java cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Source.java Propchange: cxf/branches/2.5.x-fixes/ ('svn:mergeinfo' removed) Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Destination.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Destination.java?rev=1417536&r1=1417535&r2=1417536&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Destination.java (original) +++ cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Destination.java Wed Dec 5 17:19:40 2012 @@ -21,8 +21,8 @@ package org.apache.cxf.ws.rm; import java.io.IOException; import java.util.Collection; -import java.util.HashMap; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; @@ -48,7 +48,7 @@ public class Destination extends Abstrac Destination(RMEndpoint reliableEndpoint) { super(reliableEndpoint); - map = new HashMap<String, DestinationSequence>(); + map = new ConcurrentHashMap<String, DestinationSequence>(); } public DestinationSequence getSequence(Identifier id) { Modified: cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Source.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Source.java?rev=1417536&r1=1417535&r2=1417536&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Source.java (original) +++ cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Source.java Wed Dec 5 17:19:40 2012 @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; @@ -48,7 +49,7 @@ public class Source extends AbstractEndp Source(RMEndpoint reliableEndpoint) { super(reliableEndpoint); - map = new HashMap<String, SourceSequence>(); + map = new ConcurrentHashMap<String, SourceSequence>(); current = new HashMap<String, SourceSequence>(); sequenceCreationLock = new ReentrantLock();
