You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2009/04/29 09:37:20 UTC
svn commit: r769692 - in /servicemix/smx3/branches/servicemix-3.2: ./
deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/
deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/w...
Author: ffang
Date: Wed Apr 29 07:37:19 2009
New Revision: 769692
URL: http://svn.apache.org/viewvc?rev=769692&view=rev
Log:
[SMXCOMP-504]ConcurrentModificationExceptions under heavy load in CXF BC
Modified:
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcConsumer.java
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/rm/ControlImpl.java
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.java
servicemix/smx3/branches/servicemix-3.2/pom.xml
Modified: servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcConsumer.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcConsumer.java?rev=769692&r1=769691&r2=769692&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcConsumer.java (original)
+++ servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcConsumer.java Wed Apr 29 07:37:19 2009
@@ -240,7 +240,7 @@
* interceptors that process incoming responses"
*/
public void setInInterceptors(List<Interceptor> interceptors) {
- in = interceptors;
+ in.addAll(interceptors);
}
/**
@@ -253,7 +253,7 @@
* interceptors that process incoming faults"
*/
public void setInFaultInterceptors(List<Interceptor> interceptors) {
- inFault = interceptors;
+ inFault.addAll(interceptors);
}
/**
@@ -266,7 +266,7 @@
* interceptors that process requests"
*/
public void setOutInterceptors(List<Interceptor> interceptors) {
- out = interceptors;
+ out.addAll(interceptors);
}
/**
@@ -280,7 +280,7 @@
* returned to the consumer"
*/
public void setOutFaultInterceptors(List<Interceptor> interceptors) {
- outFault = interceptors;
+ outFault.addAll(interceptors);
}
public void process(MessageExchange exchange) throws Exception {
Modified: servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java?rev=769692&r1=769691&r2=769692&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java (original)
+++ servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java Wed Apr 29 07:37:19 2009
@@ -401,7 +401,7 @@
* interceptors that process incoming requests"
*/
public void setInInterceptors(List<Interceptor> interceptors) {
- in = interceptors;
+ in.addAll(interceptors);
}
/**
@@ -414,7 +414,7 @@
* interceptors that process incoming faults"
*/
public void setInFaultInterceptors(List<Interceptor> interceptors) {
- inFault = interceptors;
+ inFault.addAll(interceptors);
}
/**
@@ -427,7 +427,7 @@
* interceptors that process responses"
*/
public void setOutInterceptors(List<Interceptor> interceptors) {
- out = interceptors;
+ out.addAll(interceptors);
}
/**
@@ -441,7 +441,7 @@
* returned to the consumer"
*/
public void setOutFaultInterceptors(List<Interceptor> interceptors) {
- outFault = interceptors;
+ outFault.addAll(interceptors);
}
/**
Modified: servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/rm/ControlImpl.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/rm/ControlImpl.java?rev=769692&r1=769691&r2=769692&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/rm/ControlImpl.java (original)
+++ servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/rm/ControlImpl.java Wed Apr 29 07:37:19 2009
@@ -160,6 +160,16 @@
// never called
return null;
}
+
+ public Response<?> setFaultLocationAsync(FaultLocation in) {
+ // never called
+ return null;
+ }
+
+ public Future<?> setFaultLocationAsync(FaultLocation in, AsyncHandler<?> asyncHandler) {
+ // never called
+ return null;
+ }
}
Modified: servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.java?rev=769692&r1=769691&r2=769692&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.java (original)
+++ servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.java Wed Apr 29 07:37:19 2009
@@ -175,7 +175,7 @@
* interceptors that process incoming requests"
*/
public void setInInterceptors(List<Interceptor> interceptors) {
- in = interceptors;
+ in.addAll(interceptors);
}
/**
@@ -188,7 +188,7 @@
* interceptors that process incoming faults"
*/
public void setInFaultInterceptors(List<Interceptor> interceptors) {
- inFault = interceptors;
+ inFault.addAll(interceptors);
}
/**
@@ -201,7 +201,7 @@
* interceptors that process response messages"
*/
public void setOutInterceptors(List<Interceptor> interceptors) {
- out = interceptors;
+ out.addAll(interceptors);
}
/**
@@ -215,7 +215,7 @@
* returned to the consumer"
*/
public void setOutFaultInterceptors(List<Interceptor> interceptors) {
- outFault = interceptors;
+ outFault.addAll(interceptors);
}
public Map getProperties() {
Modified: servicemix/smx3/branches/servicemix-3.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/pom.xml?rev=769692&r1=769691&r2=769692&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/pom.xml (original)
+++ servicemix/smx3/branches/servicemix-3.2/pom.xml Wed Apr 29 07:37:19 2009
@@ -220,7 +220,7 @@
<oro-version>2.0.8</oro-version>
<sitemesh-version>2.2.1</sitemesh-version>
<woden-version>1.0.0M6</woden-version>
- <cxf-version>2.0.11-SNAPSHOT</cxf-version>
+ <cxf-version>2.0.12-SNAPSHOT</cxf-version>
<jaxb.version>2.0</jaxb.version>
<jaxb.impl.version>2.0.1</jaxb.impl.version>
<derby-version>10.2.2.0</derby-version>