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:25:44 UTC
svn commit: r1073808 - in /cxf/branches/2.3.x-fixes: ./
rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMProperties.java rt/ws/security/
Author: dkulp
Date: Wed Feb 23 16:25:43 2011
New Revision: 1073808
URL: http://svn.apache.org/viewvc?rev=1073808&view=rev
Log:
Merged revisions 1072914,1073249 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1072914 | dsosnoski | 2011-02-21 04:54:02 -0500 (Mon, 21 Feb 2011) | 1 line
Sychronize use of collections in WS-RM acknowledgement processing (CXF-3273)
........
r1073249 | dsosnoski | 2011-02-22 03:22:32 -0500 (Tue, 22 Feb 2011) | 1 line
Eliminate need for synchronization blocks by converting to CopyOnWriteArrayList collections.
........
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/RMProperties.java
cxf/branches/2.3.x-fixes/rt/ws/security/ (props changed)
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 23 16:25:43 2011
@@ -1 +1 @@
-/cxf/trunk:1072736,1073651
+/cxf/trunk:1072736,1072914,1073249,1073651
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/RMProperties.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMProperties.java?rev=1073808&r1=1073807&r2=1073808&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMProperties.java (original)
+++ cxf/branches/2.3.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMProperties.java Wed Feb 23 16:25:43 2011
@@ -21,6 +21,7 @@ package org.apache.cxf.ws.rm;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.concurrent.CopyOnWriteArrayList;
public class RMProperties {
private SequenceType sequence;
@@ -40,11 +41,13 @@ public class RMProperties {
}
public void setAcks(Collection<SequenceAcknowledgement> a) {
- acks = a;
+ // use threadsafe implementation for working copy, to avoid concurrent modifications
+ acks = new CopyOnWriteArrayList<SequenceAcknowledgement>(a);
}
public void setAcksRequested(Collection<AckRequestedType> ar) {
- acksRequested = ar;
+ // use threadsafe implementation for working copy, to avoid concurrent modifications
+ acksRequested = new CopyOnWriteArrayList<AckRequestedType>(ar);
}
public void setSequence(SequenceType s) {
Propchange: cxf/branches/2.3.x-fixes/rt/ws/security/
('svn:mergeinfo' removed)