[prev in list] [next in list] [prev in thread] [next in thread] 

List:       sandesha-dev
Subject:    svn commit: r397182 - in
From:       chamikara () apache ! org
Date:       2006-04-26 11:37:30
Message-ID: 20060426113738.52017.qmail () minotaur ! apache ! org
[Download RAW message or body]

Author: chamikara
Date: Wed Apr 26 04:37:27 2006
New Revision: 397182

URL: http://svn.apache.org/viewcvs?rev=397182&view=rev
Log:
Sender and Invoker threads should get stopped in the module.shutDown method.

Modified:
    webservices/sandesha/trunk/src/org/apache/sandesha2/SandeshaModule.java
    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
    webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/SandeshaModule.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/SandeshaModule.java?rev=397182&r1=397181&r2=397182&view=diff
 ==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/SandeshaModule.java \
                (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/SandeshaModule.java Wed Apr \
26 04:37:27 2006 @@ -97,8 +97,10 @@
 		return new RMPolicyExtension();
 	}
 
-	// shutdown the module
-	public void shutdown(AxisConfiguration axisSystem) throws AxisFault {
+	public void shutdown(ConfigurationContext configurationContext) throws AxisFault {
+		//removing the threads started by Sandesha2.
+		SandeshaUtil.stopSender (configurationContext);
+		SandeshaUtil.stopInvoker(configurationContext);
 	}
 
 	// Removing data of uncontinuuable sequences so that the sandesha2 system

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=397182&r1=397181&r2=397182&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 04:37:27 2006 @@ -146,7 +146,7 @@
 		
 		terminateTransaction.commit(); 
 		
-		SandeshaUtil.stopSenderForTheSequence(sequenceId);
+		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=397182&r1=397181&r2=397182&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 04:37:27 2006 @@ -217,8 +217,20 @@
 		}
 	}
 
-	public static void stopSenderForTheSequence(String sequenceID) {
-//		sender.stopSenderForTheSequence(sequenceID);
+	public static void stopSenderForTheSequence(String sequenceID, ConfigurationContext \
context) { +		Sender sender = (Sender) \
context.getProperty(Sandesha2Constants.SENDER); +		
+		if (sender!=null) {
+			sender.stopSenderForTheSequence(sequenceID);
+		}
+	}
+	
+	public static void stopSender(ConfigurationContext context) {
+		Sender sender = (Sender) context.getProperty(Sandesha2Constants.SENDER);
+		
+		if (sender!=null) {
+			sender.stopSending ();
+		}
 	}
 
 	public static void startInvokerForTheSequence(ConfigurationContext context, String \
sequenceID) { @@ -238,8 +250,16 @@
 		
 	}
 
-	public static void stopInvokerForTheSequence(String sequenceID) {
-//		invoker.stopInvokerForTheSequence(sequenceID);
+	public static void stopInvokerForTheSequence(String sequenceID, \
ConfigurationContext context) { +		InOrderInvoker invoker = (InOrderInvoker) \
context.getProperty(Sandesha2Constants.INVOKER); +		if (invoker!=null)
+			invoker.stopInvokerForTheSequence(sequenceID);
+	}
+	
+	public static void stopInvoker(ConfigurationContext context) {
+		InOrderInvoker invoker = (InOrderInvoker) \
context.getProperty(Sandesha2Constants.INVOKER); +		if (invoker!=null)
+			invoker.stopInvoking();
 	}
 
 	public static String getMessageTypeString(int messageType) {

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=397182&r1=397181&r2=397182&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 04:37:27 2006 @@ -333,7 +333,7 @@
 			}
 		}
 		
-		SandeshaUtil.stopSenderForTheSequence(internalSequenceID);
+		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=397182&r1=397181&r2=397182&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 04:37:27 2006 @@ -61,8 +61,12 @@
 	public synchronized void stopInvokerForTheSequence(String sequenceID) {
 		workingSequences.remove(sequenceID);
 		if (workingSequences.size()==0) {
-			//runInvoker = false;
+			runInvoker = false;
 		}
+	}
+	
+	public synchronized void stopInvoking () {
+		runInvoker = false;
 	}
 
 	public synchronized boolean isInvokerStarted() {

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java?rev=397182&r1=397181&r2=397182&view=diff
 ==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java \
                (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java Wed Apr \
26 04:37:27 2006 @@ -67,8 +67,12 @@
 	public synchronized void stopSenderForTheSequence(String sequenceID) {
 		workingSequences.remove(sequenceID);
 		if (workingSequences.size() == 0) {
-			// stopSenderAfterWork = true;
+			 runSender = false;
 		}
+	}
+	
+	public synchronized void stopSending () {
+		runSender = false;
 	}
 
 	public synchronized boolean isSenderStarted() {



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


[prev in list] [next in list] [prev in thread] [next in thread]