Author: gatfora
Date: Mon Jun 23 05:13:15 2008
New Revision: 670531
URL: http://svn.apache.org/viewvc?rev=670531&view=rev
Log:
Applying patch for SANDESHA2-155, thanks Sara
Modified:
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/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=670531&r1=670530&r2=670531&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
Mon Jun 23 05:13:15 2008
@@ -500,12 +500,14 @@
// messages up
if(log.isWarnEnabled()) {
String message = null;
+ String internalSequenceID =
bean.getInternalSequenceID();
+ String sequenceID =
bean.getSequenceID();
if (bean.getMessageType() ==
Sandesha2Constants.MessageTypes.APPLICATION)
- message =
SandeshaMessageHelper.getMessage(SandeshaMessageKeys.noPolling);
+ message =
SandeshaMessageHelper.getMessage(SandeshaMessageKeys.noPolling, sequenceID,
internalSequenceID);
else
{
String messageType =
Integer.toString(bean.getMessageType());
- message =
SandeshaMessageHelper.getMessage(SandeshaMessageKeys.noPollingProtocol,
messageType);
+ message =
SandeshaMessageHelper.getMessage(SandeshaMessageKeys.noPollingProtocol,
messageType, sequenceID, internalSequenceID);
}
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=670531&r1=670530&r2=670531&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
Mon Jun 23 05:13:15 2008
@@ -102,8 +102,8 @@
referenceMessageNotSetForSequence=ReferenceMessage has not been set for the
sequence ''{0}''
moduleNotSet=Sandesha Module has not been set at the initiation
-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.
+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. The sequence ID is {0}. The internal sequence ID is {1}.
+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. The sequence ID is {1}. The
internal sequence ID is {2}.
freeingTransport=Freeing transport resources. A message has held the transport
for too long, check the log for other failures.
#-------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
