svn commit: r896941 - in /webservices/sandesha/trunk/java/modules/core/src/main: java/org/apache/sandesha2/util/SandeshaUtil.java java/org/apache/sandesha2/util/TerminateManager.java resources/org/apache/sandesha2/i18n/resource.properties

Author: parsonsd
Date: Thu Jan  7 17:48:21 2010
New Revision: 896941

URL: http://svn.apache.org/viewvc?rev=896941&view=rev
Log:
Improvements to error logging of Sequence Reallocation

Modified:
    webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java
    webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/TerminateManager.java
    webservices/sandesha/trunk/java/modules/core/src/main/resources/org/apache/sandesha2/i18n/resource.properties

Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java?rev=896941&r1=896940&r2=896941&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java Thu Jan  7 17:48:21 2010
@@ -1031,7 +1031,7 @@
 	*/
 	public static void reallocateMessagesToNewSequence(StorageManager storageManager, RMSBean oldRMSBean, 
 		List<MessageContext> msgsToSend, Transaction transaction)
-		throws AxisFault, SandeshaException{
+		throws Exception{
 
 		if (LoggingControl.isAnyTracingEnabled() && log.isDebugEnabled())
 			log.debug("Enter: SandeshaUtil::reallocateMessagesToNewSequence");

Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/TerminateManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/TerminateManager.java?rev=896941&r1=896940&r2=896941&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/TerminateManager.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/TerminateManager.java Thu Jan  7 17:48:21 2010
@@ -355,7 +355,10 @@
 			} catch(Exception e){
 				
 				if(LoggingControl.isAnyTracingEnabled() && log.isDebugEnabled())
-					log.warn(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.reallocationFailed, rmsBean.getSequenceID(), e.toString()));				
+					log.warn(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.reallocationFailed, rmsBean.getSequenceID()));
+				
+				if(LoggingControl.isAnyTracingEnabled() && log.isDebugEnabled())
+					log.debug("Reallocation failed for messages on sequence " + rmsBean.getSequenceID() + " because of " + e);
 			
 				//Reallocation Failed
 				//Need to mark any RMSBeans involved as failed so that we don't attempt to send

Modified: webservices/sandesha/trunk/java/modules/core/src/main/resources/org/apache/sandesha2/i18n/resource.properties
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/resources/org/apache/sandesha2/i18n/resource.properties?rev=896941&r1=896940&r2=896941&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/resources/org/apache/sandesha2/i18n/resource.properties (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/resources/org/apache/sandesha2/i18n/resource.properties Thu Jan  7 17:48:21 2010
@@ -82,7 +82,7 @@
 msgContextNotSet=Sandesha2 Internal Error: ''MessageContext'' is null.
 transportOutNotPresent=Sandesha2 Internal Error: original transport sender is not present.
 workAlreadyAssigned=Work ''{0}'' is already assigned to a different Worker. Will try the next one.
-reallocationFailed=Reallocation of msgs from sequence ''{0}'' failed, ''{1}''.
+reallocationFailed=Reallocation of msgs from sequence ''{0}'' was unsuccessful.  Undelivered messages will need to be administered manually.
 reallocationForSyncRequestReplyNotSupported=Reallocation for sync requestReply not supported.
 couldNotFindOperation=Could not find operation for message type {0} and spec level {1}.
 cannotChooseAcksTo=Could not find an appropriate acksTo for the reply sequence, given inbound sequence {0} and bean info {1}.