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 ml...@apache.org on 2006/11/17 11:50:13 UTC

svn commit: r476104 - in /webservices/sandesha/trunk/java/src/org/apache/sandesha2: util/RMMsgCreator.java util/SandeshaUtil.java workers/SenderWorker.java

Author: mlovett
Date: Fri Nov 17 02:50:13 2006
New Revision: 476104

URL: http://svn.apache.org/viewvc?view=rev&rev=476104
Log:
Applying Andy's moretrace3.patch for SANDESHA2-2

Modified:
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SenderWorker.java

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java?view=diff&rev=476104&r1=476103&r2=476104
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java Fri Nov 17 02:50:13 2006
@@ -107,7 +107,7 @@
 			context.registerOperationContext(createSeqMsgId, createSeqOpCtx);
 
 		} catch (AxisFault e) {
-			throw new SandeshaException(e.getMessage());
+			throw new SandeshaException(e.getMessage(), e);
 		}
         
 		RMMsgContext createSeqRMMsg = new RMMsgContext(createSeqmsgContext);
@@ -514,7 +514,7 @@
 
 		SequencePropertyBean seqBean = seqPropMgr.retrieve(sequencePropertyKey,
 				Sandesha2Constants.SequenceProperties.SERVER_COMPLETED_MESSAGES);
-		String msgNoList = (String) seqBean.getValue();
+		String msgNoList = seqBean.getValue();
 
 		ArrayList ackRangeArrayList = SandeshaUtil.getAckRangeArrayList(msgNoList, factory, rmNamespaceValue);
 		Iterator iterator = ackRangeArrayList.iterator();

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java?view=diff&rev=476104&r1=476103&r2=476104
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java Fri Nov 17 02:50:13 2006
@@ -213,6 +213,8 @@
 	}
 
 	public static void startSenderForTheSequence(ConfigurationContext context, String sequenceID) {
+		if (log.isDebugEnabled())
+			log.debug("Enter: SandeshaUtil::startSenderForTheSequence , context " + context + ", sequenceID " + sequenceID);
 		
 		Sender sender = (Sender) context.getProperty(Sandesha2Constants.SENDER);
 		
@@ -223,6 +225,9 @@
 			context.setProperty(Sandesha2Constants.SENDER,sender);
 			sender.runSenderForTheSequence(context, sequenceID);
 		}
+		
+		if (log.isDebugEnabled())
+			log.debug("Exit: SandeshaUtil::startSenderForTheSequence");
 	}
 	
 	public static void stopSender(ConfigurationContext context) {
@@ -428,7 +433,8 @@
 		} catch (Exception e) {
 			String message = SandeshaMessageHelper.getMessage(
 					SandeshaMessageKeys.cannotGetStorageManager);
-			log.error(message);
+			if (log.isErrorEnabled())
+			  log.error(message, e);
 			throw new SandeshaException(message,e);
 		}
 	}
@@ -1055,7 +1061,6 @@
 
 		msgContext.setProperty(Sandesha2Constants.ORIGINAL_TRANSPORT_OUT_DESC, transportOut);
 		msgContext.setProperty(Sandesha2Constants.SET_SEND_TO_TRUE, Sandesha2Constants.VALUE_TRUE);
-		msgContext.setProperty(Sandesha2Constants.MESSAGE_STORE_KEY, storageKey);
 
 		Sandesha2TransportOutDesc sandesha2TransportOutDesc = new Sandesha2TransportOutDesc();
 		msgContext.setTransportOut(sandesha2TransportOutDesc);

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SenderWorker.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SenderWorker.java?view=diff&rev=476104&r1=476103&r2=476104
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SenderWorker.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SenderWorker.java Fri Nov 17 02:50:13 2006
@@ -174,6 +174,8 @@
 				msgCtx.setPaused(false);
 			
 				AxisEngine engine = new AxisEngine (msgCtx.getConfigurationContext());
+				if (log.isDebugEnabled())
+					log.debug("Resuming a send for message : " + msgCtx.getEnvelope().getHeader());
 				engine.resumeSend(msgCtx);
 				
 				successfullySent = true;



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