Author: chamikara
Date: Thu Oct 12 20:03:46 2006
New Revision: 463553
URL: http://svn.apache.org/viewvc?view=rev&rev=463553
Log:
Patch from Andrew for Sandesha2-33.
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java?view=diff&rev=463553&r1=463552&r2=463553
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java
Thu Oct 12 20:03:46 2006
@@ -274,7 +274,7 @@
}
String receivedMsgStr =
receivedMsgsBean.getValue();
- if (receivedMsgStr !=
"" && receivedMsgStr != null)
+ if
(!receivedMsgStr.equals("") && receivedMsgStr != null)
receivedMsgStr
= receivedMsgStr + "," + Long.toString(msgNo);
else
receivedMsgStr
= Long.toString(msgNo);
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java?view=diff&rev=463553&r1=463552&r2=463553
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
Thu Oct 12 20:03:46 2006
@@ -37,9 +37,7 @@
import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisOperationFactory;
-import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.engine.AxisEngine;
-import org.apache.axis2.transport.TransportSender;
import org.apache.axis2.wsdl.WSDLConstants.WSDL20_2004Constants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -63,7 +61,6 @@
import org.apache.sandesha2.storage.beans.NextMsgBean;
import org.apache.sandesha2.storage.beans.SenderBean;
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
-import org.apache.sandesha2.transport.Sandesha2TransportOutDesc;
import org.apache.sandesha2.util.AcknowledgementManager;
import org.apache.sandesha2.util.FaultManager;
import org.apache.sandesha2.util.MsgInitializer;
@@ -220,7 +217,7 @@
String messagesStr = "";
if (msgsBean != null)
- messagesStr = (String) msgsBean.getValue();
+ messagesStr = msgsBean.getValue();
else {
msgsBean = new SequencePropertyBean();
msgsBean.setSequencePropertyKey(propertyKey);
@@ -235,7 +232,7 @@
rmMsgCtx.pause();
}
- if (messagesStr != "" && messagesStr != null)
+ if (messagesStr != null && !"".equals(messagesStr))
messagesStr = messagesStr + "," + Long.toString(msgNo);
else
messagesStr = Long.toString(msgNo);
@@ -265,7 +262,7 @@
if (inOrderInvocation) {
- SequencePropertyBean incomingSequenceListBean =
(SequencePropertyBean) seqPropMgr.retrieve(
+ SequencePropertyBean incomingSequenceListBean =
seqPropMgr.retrieve(
Sandesha2Constants.SequenceProperties.ALL_SEQUENCES,
Sandesha2Constants.SequenceProperties.INCOMING_SEQUENCE_LIST);
@@ -521,7 +518,7 @@
}
String incomingSeqId =
reqSequence.getIdentifier().getIdentifier();
- if (incomingSeqId == null || incomingSeqId == "") {
+ if (incomingSeqId == null || "".equals(incomingSeqId)) {
String message =
SandeshaMessageHelper.getMessage(SandeshaMessageKeys.incomingSequenceNotValidID,
"''"
+ incomingSeqId + "''");
log.debug(message);
@@ -1012,7 +1009,7 @@
replyToEPR = new
EndpointReference(replyToBean.getValue());
}
- if (toEPR == null || toEPR.getAddress() == null ||
toEPR.getAddress() == "") {
+ if (toEPR == null || toEPR.getAddress() == null ||
"".equals(toEPR.getAddress())) {
String message =
SandeshaMessageHelper.getMessage(SandeshaMessageKeys.toEPRNotValid, null);
log.debug(message);
throw new SandeshaException(message);
@@ -1103,7 +1100,7 @@
identifierStr = Sandesha2Constants.TEMP_SEQUENCE_ID;
} else {
- identifierStr = (String) outSequenceBean.getValue();
+ identifierStr = outSequenceBean.getValue();
}
Identifier id1 = new Identifier(rmNamespaceValue);
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java?view=diff&rev=463553&r1=463552&r2=463553
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
Thu Oct 12 20:03:46 2006
@@ -18,9 +18,13 @@
package org.apache.sandesha2.msgprocessors;
import java.util.Collection;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
@@ -115,8 +119,6 @@
// created
// sequnceID.
-
-
RMMsgContext createSeqResponse =
RMMsgCreator.createCreateSeqResponseMsg(createSeqRMMsg, outMessage,
newSequenceId, storageManager); //
converting the blank out
// message in to a create
@@ -194,7 +196,7 @@
}
EndpointReference acksTo =
createSeqPart.getAcksTo().getAddress().getEpr();
- if (acksTo == null || acksTo.getAddress() == null ||
acksTo.getAddress() == "") {
+ if (acksTo == null || acksTo.getAddress() == null ||
"".equals(acksTo.getAddress())) {
String message =
SandeshaMessageHelper.getMessage(SandeshaMessageKeys.noAcksToPartInCreateSequence);
log.debug(message);
throw new AxisFault(message);
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java?view=diff&rev=463553&r1=463552&r2=463553
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
Thu Oct 12 20:03:46 2006
@@ -150,7 +150,9 @@
.getConfigurationContext());
- outMessage.setServerSide(false);
+ outMessage.setServerSide(true);
+
+
engine.send(outMessage);
String addressingNamespaceURI = SandeshaUtil
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
