Author: mckierna
Date: Wed Jul 30 02:37:13 2008
New Revision: 680951
URL: http://svn.apache.org/viewvc?rev=680951&view=rev
Log:
CSeq offers with anon EPRs (see
https://issues.apache.org/jira/browse/SANDESHA2-169)
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/msgprocessors/CreateSeqMsgProcessor.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=680951&r1=680950&r2=680951&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
Wed Jul 30 02:37:13 2008
@@ -50,6 +50,7 @@
public static final String
cannotSendMsgAsSequenceTerminated="cannotSendMsgAsSequenceTerminated";
public static final String
cannotSendMsgAsSequenceTimedout="cannotSendMsgAsSequenceTimedout";
public static final String cannotSendMsgAsEPRWrong =
"cannotSendMsgAsEPRWrong";
+ public static final String sequenceMEPWarning="sequenceMEPWarning";
public static final String noValidSyncResponse="noValidSyncResponse";
public static final String classLoaderNotFound="classLoaderNotFound";
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java?rev=680951&r1=680950&r2=680951&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
Wed Jul 30 02:37:13 2008
@@ -193,15 +193,17 @@
String addressingNamespace =
(String) createSeqRMMsg.getProperty(AddressingConstants.WS_ADDRESSING_VERSION);
String endpointAddress =
endpoint.getEPR().getAddress();
if(SpecSpecificConstants.getAddressingAnonymousURI(addressingNamespace).equals(endpointAddress)){
- //Don't accept the offer
+ //We will still accept
this offer but we should warn the user that this MEP is not always reliable or
efficient
if
(log.isDebugEnabled())
-
log.debug("Offer Refused as it included a WSA Anonymous endpoint");
- offerAccepted = false;
- } else {
- rMSBean = new RMSBean();
- //Set the offered EP
-
rMSBean.setOfferedEndPoint(endpointAddress);
- }
+ log.debug("CSeq
msg contains offer with an anonymous EPR");
+
log.warn(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.sequenceMEPWarning,
createSeqRMMsg.getMessageContext().getMessageID(),
+
offeredSequenceID));
+ }
+
+ rMSBean = new RMSBean();
+ //Set the offered EP
+
rMSBean.setOfferedEndPoint(endpointAddress);
+
} else {
//Don't accept the offer
if (log.isDebugEnabled())
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=680951&r1=680950&r2=680951&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
Wed Jul 30 02:37:13 2008
@@ -65,6 +65,7 @@
cannotSendMsgAsSequenceTerminated=Sandesha2 could not send the message on
sequence {0} as the sequence has been terminated.
cannotSendMsgAsSequenceTimedout=Sandesha2 could not send the message on
sequence {0} as the sequence has timed out.
cannotSendMsgAsEPRWrong=Sandesha2 could not send the message {0} on sequence
{1} as the message exchange pattern does not match that of the sequence: a
sequence supports either synchronous use or asynchronous use, not both.
+sequenceMEPWarning=The received CreateSequence message with ID {0} is
attempting to offer a response WS-ReliableMessaging sequence {1} that does
include an addressable endpoint reference. With some clients this can affect
the reliability and efficiency of the message exchange.
noValidSyncResponse=Sandesha2 sender thread has not received a valid
synchronous response.
classLoaderNotFound=Module class loader not found.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
