ws-sandesha-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mlov...@apache.org
Subject svn commit: r575365 - in /webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2: msgprocessors/SequenceProcessor.java storage/inmemory/InMemoryBeanMgr.java workers/Sender.java
Date Thu, 13 Sep 2007 16:45:24 GMT
Author: mlovett
Date: Thu Sep 13 09:45:23 2007
New Revision: 575365

URL: http://svn.apache.org/viewvc?rev=575365&view=rev
Log:
Ensure we free the transport as soon as possible

Modified:
    webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/SequenceProcessor.java
    webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryBeanMgr.java
    webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/Sender.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=575365&r1=575364&r2=575365&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
Thu Sep 13 09:45:23 2007
@@ -352,14 +352,14 @@
 			
 			// If the MEP doesn't need the backchannel, and nor do we, we should signal it so that
it
 			// can close off as soon as possible.
-			result = InvocationResponse.ABORT;
-			RequestResponseTransport t = null;
-			t = (RequestResponseTransport) rmMsgCtx.getProperty(RequestResponseTransport.TRANSPORT_CONTROL);
-			
-			// Tell the transport that there will be no response message
-			if(t != null && RequestResponseTransportStatus.WAITING.equals(t.getStatus()))
{
-				TransportUtils.setResponseWritten(msgCtx, false);
-				t.acknowledgeMessage(msgCtx);
+			if (backchannelFree) {
+				RequestResponseTransport t = null;
+				t = (RequestResponseTransport) rmMsgCtx.getProperty(RequestResponseTransport.TRANSPORT_CONTROL);
+
+				if(t != null && RequestResponseTransportStatus.WAITING.equals(t.getStatus()))
{
+					TransportUtils.setResponseWritten(msgCtx, false);
+					t.acknowledgeMessage(msgCtx);
+				}
 			}
 		}
 		

Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryBeanMgr.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryBeanMgr.java?rev=575365&r1=575364&r2=575365&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryBeanMgr.java
(original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryBeanMgr.java
Thu Sep 13 09:45:23 2007
@@ -128,8 +128,9 @@
 								SandeshaMessageKeys.nonUniqueResult,
 								result.toString(),
 								candidate.toString());
-						log.error(message);
-						throw new SandeshaException (message);
+						SandeshaException e = new SandeshaException(message);
+						log.error(message, e);
+						throw e;
 					}
 				}
 			}

Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/Sender.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/Sender.java?rev=575365&r1=575364&r2=575365&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/Sender.java
(original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/Sender.java
Thu Sep 13 09:45:23 2007
@@ -416,7 +416,7 @@
 				if (inMsg != null)
 					t = (RequestResponseTransport) inMsg.getProperty(RequestResponseTransport.TRANSPORT_CONTROL);
 	
-				if((t != null && !RequestResponseTransportStatus.WAITING.equals(t.getStatus())))
{
+				if((t != null && RequestResponseTransportStatus.WAITING.equals(t.getStatus())))
{
 					if(log.isWarnEnabled()) {
 						String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.freeingTransport);
 						log.warn(message);



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


Mime
View raw message