svn commit: r903723 - /webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/SequenceProcessor.java

[pa...@apache.org]

Author: parsonsd
Date: Wed Jan 27 16:42:44 2010
New Revision: 903723

URL: http://svn.apache.org/viewvc?rev=903723&view=rev
Log:
Further update related to the last fix.  A null check was added as Sync RM 1.0 msgCtx's may not have a to address.

Modified:
    webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/SequenceProcessor.java

Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/SequenceProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/SequenceProcessor.java?rev=903723&r1=903722&r2=903723&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/SequenceProcessor.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/SequenceProcessor.java Wed Jan 27 16:42:44 2010
@@ -269,7 +269,6 @@
 		EndpointReference toEPR = msgCtx.getTo();
 		if(toEPR == null || toEPR.hasAnonymousAddress()) {
 			RMSBean outBean = null;
-
 			// Look for the correct outbound sequence by checking the anon uuid (if there is one)
 			String toAddress = (toEPR == null) ? null : toEPR.getAddress();
 			if(SandeshaUtil.isWSRMAnonymous(toAddress)) {
@@ -429,18 +428,18 @@
 				}
 			}
 
-            // if the relates to is not null then this is at the client side
-            // so it is receiving a response.  We have to abort the thread in the Async case as 
+			// if the relates to is not null then this is at the client side
+			// so it is receiving a response.  We have to abort the thread in the Async case as 
 			// we don't want too many threads open e.g. many async responses coming in at once all waiting
 			// for an earlier response which hasn't arrived.  In the Sync case we need to suspend as aborting
 			// causes Axis to mark this msg as delivered and then when the invoker thread tries to deliver
 			// the msg Axis returns with a NullPointerException.
-            if (msgCtx.getRelatesTo() != null && !msgCtx.getTo().hasAnonymousAddress()) {
-                result = InvocationResponse.ABORT;
-                if (log.isDebugEnabled())
-    				log.debug("SequenceProcessor::processReliableMessage, Aborting the thread as this " +
-    						"is an async response requiring inorder delivery.  An invoker thread will process the delivery"); 
-            } 
+			if (msgCtx.getRelatesTo() != null && msgCtx.getTo() != null && !msgCtx.getTo().hasAnonymousAddress()) {
+				result = InvocationResponse.ABORT;
+				if (log.isDebugEnabled())
+					log.debug("SequenceProcessor::processReliableMessage, Aborting the thread as this " +
+							"is an async response requiring inorder delivery.  An invoker thread will process the delivery"); 
+			} 
 		}
 
 		if (transaction != null && transaction.isActive()) 



---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org