Author: ningjiang
Date: Fri Apr 1 11:48:23 2011
New Revision: 1087660
URL: http://svn.apache.org/viewvc?rev=1087660&view=rev
Log:
Merged revisions 1087657 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1087657 | ningjiang | 2011-04-01 19:42:33 +0800 (Fri, 01 Apr 2011) | 1 line
CXF-3427 JMSContinuation should be thread safe
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/continuations/JMSContinuation.java
cxf/branches/2.3.x-fixes/rt/ws/security/ (props changed)
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 1 11:48:23 2011
@@ -1 +1 @@
-/cxf/trunk:1084966,1086102,1086115,1086535,1086573,1086588,1086615
+/cxf/trunk:1084966,1086102,1086115,1086535,1086573,1086588,1086615,1087657
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/continuations/JMSContinuation.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/continuations/JMSContinuation.java?rev=1087660&r1=1087659&r2=1087660&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/continuations/JMSContinuation.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/continuations/JMSContinuation.java
Fri Apr 1 11:48:23 2011
@@ -76,7 +76,7 @@ public class JMSContinuation implements
return isResumed;
}
- public void reset() {
+ public synchronized void reset() {
cancelTimerTask();
isNew = true;
isPending = false;
@@ -84,7 +84,7 @@ public class JMSContinuation implements
userObject = null;
}
- public void resume() {
+ public synchronized void resume() {
if (isResumed || !isPending) {
return;
}
@@ -93,7 +93,7 @@ public class JMSContinuation implements
doResume();
}
- protected synchronized void doResume() {
+ protected void doResume() {
updateContinuations(true);
BusFactory.setThreadDefaultBus(bus);
try {
@@ -108,7 +108,7 @@ public class JMSContinuation implements
userObject = o;
}
- public boolean suspend(long timeout) {
+ public synchronized boolean suspend(long timeout) {
if (isPending) {
return false;
Propchange: cxf/branches/2.3.x-fixes/rt/ws/security/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 1 11:48:23 2011
@@ -1 +1 @@
-/cxf/trunk/rt/ws/security:1084966,1086102,1086115,1086535,1086550,1086573,1086615
+/cxf/trunk/rt/ws/security:1084966,1086102,1086115,1086535,1086550,1086573,1086615,1087657
