You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by ch...@apache.org on 2006/04/27 07:21:24 UTC
svn commit: r397403 - in
/webservices/sandesha/trunk/src/org/apache/sandesha2:
msgprocessors/TerminateSeqMsgProcessor.java util/SandeshaUtil.java
util/TerminateManager.java workers/InOrderInvoker.java
Author: chamikara
Date: Wed Apr 26 22:21:23 2006
New Revision: 397403
URL: http://svn.apache.org/viewcvs?rev=397403&view=rev
Log:
Fixed a bug in logic for stopping the Sender and Invoker
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java
webservices/sandesha/trunk/src/org/apache/sandesha2/util/TerminateManager.java
webservices/sandesha/trunk/src/org/apache/sandesha2/workers/InOrderInvoker.java
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java?rev=397403&r1=397402&r2=397403&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java Wed Apr 26 22:21:23 2006
@@ -146,7 +146,7 @@
terminateTransaction.commit();
- SandeshaUtil.stopSenderForTheSequence(sequenceId,context);
+// SandeshaUtil.stopSenderForTheSequence(sequenceId,context);
//removing an entry from the listener
String transport = terminateSeqMsg.getTransportIn().getName().getLocalPart();
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java?rev=397403&r1=397402&r2=397403&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java Wed Apr 26 22:21:23 2006
@@ -217,7 +217,7 @@
}
}
- public static void stopSenderForTheSequence(String sequenceID, ConfigurationContext context) {
+ private static void stopSenderForTheSequence(String sequenceID, ConfigurationContext context) {
Sender sender = (Sender) context.getProperty(Sandesha2Constants.SENDER);
if (sender!=null) {
@@ -246,11 +246,9 @@
context.setProperty(Sandesha2Constants.INVOKER,invoker);
invoker.runInvokerForTheSequence(context,sequenceID);
}
-
-
}
- public static void stopInvokerForTheSequence(String sequenceID, ConfigurationContext context) {
+ private static void stopInvokerForTheSequence(String sequenceID, ConfigurationContext context) {
InOrderInvoker invoker = (InOrderInvoker) context.getProperty(Sandesha2Constants.INVOKER);
if (invoker!=null)
invoker.stopInvokerForTheSequence(sequenceID);
@@ -502,7 +500,7 @@
newMessageContext.setServiceGroupContext(serviceGroupContext);
}
- if (referenceMessage.getAxisService() != null) {
+ if (referenceMessage.getServiceContext() != null) {
newMessageContext.setAxisService(referenceMessage.getAxisService());
newMessageContext.setServiceContext(referenceMessage.getServiceContext());
newMessageContext.setServiceContextID(referenceMessage.getServiceContextID());
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/util/TerminateManager.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/TerminateManager.java?rev=397403&r1=397402&r2=397403&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/TerminateManager.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/TerminateManager.java Wed Apr 26 22:21:23 2006
@@ -333,7 +333,7 @@
}
}
- SandeshaUtil.stopSenderForTheSequence(internalSequenceID,configContext);
+// SandeshaUtil.stopSenderForTheSequence(internalSequenceID,configContext);
}
public static void addTerminateSequenceMessage(RMMsgContext referenceMessage,
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/workers/InOrderInvoker.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/workers/InOrderInvoker.java?rev=397403&r1=397402&r2=397403&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/workers/InOrderInvoker.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/workers/InOrderInvoker.java Wed Apr 26 22:21:23 2006
@@ -212,7 +212,7 @@
TerminateManager.cleanReceivingSideAfterInvocation(context, sequenceId);
//this sequence has no more invocations
- stopInvokerForTheSequence(sequenceId);
+// stopInvokerForTheSequence(sequenceId);
//exit from current iteration. (since an entry was removed)
invocationTransaction.commit();
@@ -233,5 +233,7 @@
e1.printStackTrace();
}
}
+
+ int i = 1;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org