You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by ga...@apache.org on 2007/09/13 13:22:50 UTC

svn commit: r575257 - in /webservices/sandesha/trunk/java/modules/core/src/main: java/org/apache/sandesha2/i18n/SandeshaMessageKeys.java java/org/apache/sandesha2/workers/Sender.java resources/org/apache/sandesha2/i18n/resource.properties

Author: gatfora
Date: Thu Sep 13 04:22:49 2007
New Revision: 575257

URL: http://svn.apache.org/viewvc?rev=575257&view=rev
Log:
Alter the Orphaned message message to indicate if it was an application message or RM protocol message that is orphaned

Modified:
    webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/i18n/SandeshaMessageKeys.java
    webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/Sender.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/i18n/SandeshaMessageKeys.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/i18n/SandeshaMessageKeys.java?rev=575257&r1=575256&r2=575257&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/i18n/SandeshaMessageKeys.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/i18n/SandeshaMessageKeys.java Thu Sep 13 04:22:49 2007
@@ -235,6 +235,7 @@
 	public final static String moduleNotSet = "moduleNotSet";
 	public final static String cannotSetPolicyBeanServiceNull = "cannotSetPolicyBeanServiceNull";
 	public final static String noPolling="noPolling";
+	public final static String noPollingProtocol="noPollingProtocol";
 	public final static String freeingTransport="freeingTransport";
 	public final static String offerRequiredForAnon = "offerRequiredForAnon";
 	public final static String couldNotSendFaultDueToException="couldNotSendFaultDueToException";

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=575257&r1=575256&r2=575257&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 04:22:49 2007
@@ -493,8 +493,14 @@
 				// Emit a message to warn the user that MakeConnections are not arriving to pick
 				// messages up
 				if(log.isWarnEnabled()) {
-					String messageType = Integer.toString(bean.getMessageType());
-					String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.noPolling, messageType);
+					String message = null;
+					if (bean.getMessageType() == Sandesha2Constants.MessageTypes.APPLICATION)					
+						message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.noPolling);					
+					else
+					{
+						String messageType = Integer.toString(bean.getMessageType());
+						message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.noPollingProtocol, messageType);
+					}
 					log.warn(message);
 				}
 				

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=575257&r1=575256&r2=575257&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 Sep 13 04:22:49 2007
@@ -82,7 +82,9 @@
 rmEnforceFailure=The message with MessageID ''{0}'' is not WSRM enabled but the service enforces WSRM.
 referenceMessageNotSetForSequence=ReferenceMessage has not been set for the sequence ''{0}''
 moduleNotSet=Sandesha Module has not been set at the initiation
-noPolling=A message has been waiting for a MakeConnection call. The message will continue to wait, but there may be a problem with the client configuration. Sandesha message type {0}.
+
+noPolling=An application message has been waiting for a MakeConnection call. The message will continue to wait, but there may be a problem with the client configuration.
+noPollingProtocol=A WS-Reliable messaging protocol message {0} has been waiting for a MakeConnection call. The message will continue to wait, but there may be a problem with the client configuration.
 freeingTransport=Freeing transport resources. A message has held the transport for too long, check the log for other failures.
 
 #-------------------------------------



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