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 2009/02/25 16:25:32 UTC
svn commit: r747818 - in /cxf/branches/2.0.x-fixes: ./
rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/
rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/
rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/
rt/ws/rm/src/test/java/org/apache/cxf...
Author: dkulp
Date: Wed Feb 25 15:25:32 2009
New Revision: 747818
URL: http://svn.apache.org/viewvc?rev=747818&view=rev
Log:
Merged revisions 747459 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................
r747459 | dkulp | 2009-02-24 12:46:47 -0500 (Tue, 24 Feb 2009) | 9 lines
Merged revisions 746306 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r746306 | eglynn | 2009-02-20 12:49:22 -0500 (Fri, 20 Feb 2009) | 1 line
Allow the spuriously resent messages to be passed through to WS-RM in certain circumstances by WS-A, so that the additional ACKs are not lost.
........
................
Modified:
cxf/branches/2.0.x-fixes/ (props changed)
cxf/branches/2.0.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
cxf/branches/2.0.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
cxf/branches/2.0.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java
cxf/branches/2.0.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java
cxf/branches/2.0.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java
cxf/branches/2.0.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 25 15:25:32 2009
@@ -1,3 +1,3 @@
-/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192
96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726045,726048,726106,726123,726745-726746,726749,726754,726756-726758,726995,727794,727797-727798,727800,731676,731684,731686-731688,731690,733587,733873,733876,733884,733891,733893,733915,735132,735136,735789,736451,736453,736456,736761,736765,736771,736827,736853,737126,737706,737714,737716,737726,737729-737730,737732,737734,737737,737861,738167,738181,738202,738206,738208,738243,738245,738588-738594,739379,739916,739920-739921,739930,740043,740190,740195,740326,740328,740959,741153-741156,741159,741163,741190,743496,743498-743499,743501-743502,743504,743512,743516,743968,744173,744181,745593,745596,745598,745600,745604-745605,745607,745639,745954,746013,746021-746022
-/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,725799,725839,726342,726524,726631,726637,726639,726692,726724,726992,727445,727692,727754,727792,730139,731598,731604,731615,73163
1,731635,732320,732363,732411,732710,732773,732827,732829,733582,734666,734836,735734,736332,736343,736352,736408,736423,736491,736738,736766,736825,736852,737032,737069,737124,737237,737299,737356,737494,737498,737855,738166,738178,738201,738242,738244,739367,739799-739800,739876-739877,739922,739937,740154,740186,740197,740255,740810,740844,740886,740902,740923,741124,741152,741188,741521,741529,741879,743087,743439,743441,743459,743469,743965,743967,744175,744195,744756,745214,745243,745560,745578,745586,745638,745950,746012,746019-746020
+/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192
96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726045,726048,726106,726123,726745-726746,726749,726754,726756-726758,726995,727794,727797-727798,727800,731676,731684,731686-731688,731690,733587,733873,733876,733884,733891,733893,733915,735132,735136,735789,736451,736453,736456,736761,736765,736771,736827,736853,737126,737706,737714,737716,737726,737729-737730,737732,737734,737737,737861,738167,738181,738202,738206,738208,738243,738245,738588-738594,739379,739916,739920-739921,739930,740043,740190,740195,740326,740328,740959,741153-741156,741159,741163,741190,743496,743498-743499,743501-743502,743504,743512,743516,743968,744173,744181,745593,745596,745598,745600,745604-745605,745607,745639,745954,746013,746021-746022,747459
+/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,725799,725839,726342,726524,726631,726637,726639,726692,726724,726992,727445,727692,727754,727792,730139,731598,731604,731615,73163
1,731635,732320,732363,732411,732710,732773,732827,732829,733582,734666,734836,735734,736332,736343,736352,736408,736423,736491,736738,736766,736825,736852,737032,737069,737124,737237,737299,737356,737494,737498,737855,738166,738178,738201,738242,738244,739367,739799-739800,739876-739877,739922,739937,740154,740186,740197,740255,740810,740844,740886,740902,740923,741124,741152,741188,741521,741529,741879,743087,743439,743441,743459,743469,743965,743967,744175,744195,744756,745214,745243,745560,745578,745586,745638,745950,746012,746019-746020,746306
/incubator/cxf/trunk:434594-651668
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.0.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java?rev=747818&r1=747817&r2=747818&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java (original)
+++ cxf/branches/2.0.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java Wed Feb 25 15:25:32 2009
@@ -574,6 +574,58 @@
}
/**
+ * Store indication that a deferred uncorrelated message abort is
+ * supported
+ *
+ * @param message the current message
+ */
+ public static void storeDeferUncorrelatedMessageAbort(Message message) {
+ if (message.getExchange() != null) {
+ message.getExchange().put("defer.uncorrelated.message.abort", Boolean.TRUE);
+ }
+ }
+
+ /**
+ * Retrieve indication that a deferred uncorrelated message abort is
+ * supported
+ *
+ * @param message the current message
+ * @returned the retrieved indication
+ */
+ public static boolean retrieveDeferUncorrelatedMessageAbort(Message message) {
+ Boolean ret = message.getExchange() != null
+ ? (Boolean)message.getExchange().get("defer.uncorrelated.message.abort")
+ : null;
+ return ret != null && ret.booleanValue();
+ }
+
+ /**
+ * Store indication that a deferred uncorrelated message abort should
+ * occur
+ *
+ * @param message the current message
+ */
+ public static void storeDeferredUncorrelatedMessageAbort(Message message) {
+ if (message.getExchange() != null) {
+ message.getExchange().put("deferred.uncorrelated.message.abort", Boolean.TRUE);
+ }
+ }
+
+ /**
+ * Retrieve indication that a deferred uncorrelated message abort should
+ * occur.
+ *
+ * @param message the current message
+ * @returned the retrieved indication
+ */
+ public static boolean retrieveDeferredUncorrelatedMessageAbort(Message message) {
+ Boolean ret = message.getExchange() != null
+ ? (Boolean)message.getExchange().get("deferred.uncorrelated.message.abort")
+ : null;
+ return ret != null && ret.booleanValue();
+ }
+
+ /**
* Retrieve indication that an async post-response service invocation
* is required.
*
Modified: cxf/branches/2.0.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java?rev=747818&r1=747817&r2=747818&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java (original)
+++ cxf/branches/2.0.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java Wed Feb 25 15:25:32 2009
@@ -46,7 +46,6 @@
import org.apache.cxf.binding.soap.interceptor.AbstractSoapInterceptor;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.StringUtils;
-import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.headers.Header;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.helpers.DOMUtils;
@@ -715,20 +714,16 @@
uncorrelatedExchanges.remove(maps.getRelatesTo().getValue());
if (correlatedExchange != null) {
synchronized (correlatedExchange) {
- Exchange tmpExchange = message.getExchange();
message.setExchange(correlatedExchange);
- Endpoint endpoint = correlatedExchange.get(Endpoint.class);
- if (Boolean.TRUE.equals(tmpExchange.get("deferred.fault.observer.notification"))
- && endpoint != null) {
- message.getInterceptorChain().abort();
- if (endpoint.getInFaultObserver() != null) {
- endpoint.getInFaultObserver().onMessage(message);
- }
- }
}
} else {
- LOG.log(Level.WARNING, "CORRELATION_FAILURE_MSG");
- message.getInterceptorChain().abort();
+ if (ContextUtils.retrieveDeferUncorrelatedMessageAbort(message)) {
+ LOG.fine("deferring uncorrelated message abort");
+ ContextUtils.storeDeferredUncorrelatedMessageAbort(message);
+ } else {
+ LOG.log(Level.WARNING, "CORRELATION_FAILURE_MSG");
+ message.getInterceptorChain().abort();
+ }
}
} else if (maps == null && isRequestor(message)) {
Message m = message.getExchange().getOutMessage();
Modified: cxf/branches/2.0.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java?rev=747818&r1=747817&r2=747818&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java (original)
+++ cxf/branches/2.0.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java Wed Feb 25 15:25:32 2009
@@ -26,6 +26,7 @@
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.message.Message;
import org.apache.cxf.ws.addressing.AddressingPropertiesImpl;
+import org.apache.cxf.ws.addressing.ContextUtils;
import org.apache.cxf.ws.addressing.MAPAggregator;
/**
@@ -88,7 +89,12 @@
processSequence(destination, message);
processDeliveryAssurance(rmps);
}
- rme.receivedApplicationMessage();
+ if (ContextUtils.retrieveDeferredUncorrelatedMessageAbort(message)) {
+ LOG.info("deferred uncorrelated message abort");
+ message.getInterceptorChain().abort();
+ } else {
+ rme.receivedApplicationMessage();
+ }
} else {
rme.receivedControlMessage();
if (RMConstants.getSequenceAckAction().equals(action)) {
Modified: cxf/branches/2.0.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java?rev=747818&r1=747817&r2=747818&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java (original)
+++ cxf/branches/2.0.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java Wed Feb 25 15:25:32 2009
@@ -31,6 +31,7 @@
import org.apache.cxf.message.MessageUtils;
import org.apache.cxf.ws.addressing.AddressingProperties;
import org.apache.cxf.ws.addressing.AttributedURIType;
+import org.apache.cxf.ws.addressing.ContextUtils;
import org.apache.cxf.ws.addressing.MAPAggregator;
import org.apache.cxf.ws.addressing.VersionTransformer;
import org.apache.cxf.ws.addressing.v200408.AttributedURI;
@@ -110,6 +111,7 @@
inSeqId = rmpsIn.getSequence().getIdentifier();
inMessageNumber = rmpsIn.getSequence().getMessageNumber();
}
+ ContextUtils.storeDeferUncorrelatedMessageAbort(message);
}
if ((isApplicationMessage || isLastMessage)
Modified: cxf/branches/2.0.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java?rev=747818&r1=747817&r2=747818&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java (original)
+++ cxf/branches/2.0.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java Wed Feb 25 15:25:32 2009
@@ -26,6 +26,7 @@
import java.util.SortedSet;
import java.util.TreeSet;
+import org.apache.cxf.interceptor.InterceptorChain;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.Phase;
@@ -170,8 +171,19 @@
public void testAppResponse() throws SequenceFault, RMException, NoSuchMethodException {
testAppMessage(false);
}
+
+ @Test
+ public void testDefferedAbort() throws SequenceFault, RMException, NoSuchMethodException {
+ testAppMessage(false, true);
+ }
- private void testAppMessage(boolean onServer) throws SequenceFault, RMException, NoSuchMethodException {
+ private void testAppMessage(boolean onServer)
+ throws SequenceFault, RMException, NoSuchMethodException {
+ testAppMessage(onServer, false);
+ }
+
+ private void testAppMessage(boolean onServer, boolean deferredAbort)
+ throws SequenceFault, RMException, NoSuchMethodException {
Method m1 = RMInInterceptor.class.getDeclaredMethod("processAcknowledgments",
new Class[] {Source.class, RMProperties.class});
Method m2 = RMInInterceptor.class.getDeclaredMethod("processAcknowledgmentRequests",
@@ -196,7 +208,16 @@
interceptor.processDeliveryAssurance(rmps);
EasyMock.expectLastCall();
EasyMock.expect(message.get(AssertionInfoMap.class)).andReturn(null);
- rme.receivedApplicationMessage();
+
+ Exchange ex = control.createMock(Exchange.class);
+ message.getExchange();
+ EasyMock.expectLastCall().andReturn(ex).anyTimes();
+ ex.get("deferred.uncorrelated.message.abort");
+ EasyMock.expectLastCall().andReturn(Boolean.TRUE);
+ InterceptorChain chain = control.createMock(InterceptorChain.class);
+ message.getInterceptorChain();
+ EasyMock.expectLastCall().andReturn(chain);
+ chain.abort();
EasyMock.expectLastCall();
control.replay();
Modified: cxf/branches/2.0.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java?rev=747818&r1=747817&r2=747818&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java (original)
+++ cxf/branches/2.0.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java Wed Feb 25 15:25:32 2009
@@ -114,8 +114,9 @@
Message message = control.createMock(Message.class);
EasyMock.expect(interceptor.isRuntimeFault(message)).andReturn(false);
Exchange ex = control.createMock(Exchange.class);
- EasyMock.expect(message.getExchange()).andReturn(ex).times(3);
- EasyMock.expect(ex.getOutMessage()).andReturn(message).times(1);
+ EasyMock.expect(message.getExchange()).andReturn(ex).anyTimes();
+ EasyMock.expect(ex.getOutMessage()).andReturn(message).times(1);
+ EasyMock.expect(ex.put("defer.uncorrelated.message.abort", Boolean.TRUE)).andReturn(null);
EasyMock.expect(message.get(Message.REQUESTOR_ROLE)).andReturn(Boolean.TRUE).anyTimes();
EasyMock.expect(message.get(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND))
.andReturn(maps).anyTimes();