Author: chamikara
Date: Tue Sep 12 23:29:07 2006
New Revision: 442863
URL: http://svn.apache.org/viewvc?view=rev&rev=442863
Log:
Renamed the sequenceId property of the sequencePropertyBean manager to
sequencePropertyKey.
This reflects its real functionality (since we can use
sequenceId/internalSequenceId depending
on the RM endpoint).
Applied the patch from Thomas solving a possible NPE.
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/RMMsgContext.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/SequencePropertyBean.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemorySequencePropertyBeanMgr.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/FaultManager.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/MsgInitializer.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/RMMsgContext.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/RMMsgContext.java?view=diff&rev=442863&r1=442862&r2=442863
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/RMMsgContext.java
(original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/RMMsgContext.java
Tue Sep 12 23:29:07 2006
@@ -138,6 +138,7 @@
ArrayList sequenceAckList = (ArrayList)
rmMessageParts.get(new Integer (partId));
if (sequenceAckList==null) {
sequenceAckList = new ArrayList ();
+ sequenceAckList.add(part);
rmMessageParts.put(new Integer
(partId),sequenceAckList);
}
} else {
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java?view=diff&rev=442863&r1=442862&r2=442863
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java
Tue Sep 12 23:29:07 2006
@@ -262,7 +262,7 @@
Iterator iterator = collection.iterator();
while (iterator.hasNext()) {
SequencePropertyBean bean =
(SequencePropertyBean) iterator.next();
- String sequenceID = bean.getSequenceID();
+ String sequenceID =
bean.getSequencePropertyKey();
sandeshaReport.addToOutgoingSequenceList(sequenceID);
sandeshaReport.addToOutgoingInternalSequenceMap(sequenceID, bean.getValue());
@@ -280,7 +280,7 @@
Iterator iter = serverCompletedMsgsBeans.iterator();
while (iter.hasNext()) {
SequencePropertyBean serverCompletedMsgsBean =
(SequencePropertyBean) iter.next();
- String sequenceID =
serverCompletedMsgsBean.getSequenceID();
+ String sequenceID =
serverCompletedMsgsBean.getSequencePropertyKey();
sandeshaReport.addToIncomingSequenceList(sequenceID);
SequenceReport sequenceReport =
getIncomingSequenceReport(sequenceID, configurationContext);
@@ -802,7 +802,7 @@
return false;
}
- String outSequenceID = internalSequenceBean.getSequenceID();
+ String outSequenceID =
internalSequenceBean.getSequencePropertyKey();
SequencePropertyBean sequenceTerminatedBean =
seqPropMgr.retrieve(outSequenceID,
Sandesha2Constants.SequenceProperties.SEQUENCE_TERMINATED);
@@ -828,7 +828,7 @@
return false;
}
- String outSequenceID = internalSequenceBean.getSequenceID();
+ String outSequenceID =
internalSequenceBean.getSequencePropertyKey();
SequencePropertyBean sequenceTerminatedBean =
seqPropMgr.retrieve(outSequenceID,
Sandesha2Constants.SequenceProperties.SEQUENCE_TIMED_OUT);
if (sequenceTerminatedBean != null &&
Sandesha2Constants.VALUE_TRUE.equals(sequenceTerminatedBean.getValue())) {
@@ -855,7 +855,7 @@
report.setSequenceStatus(SequenceReport.SEQUENCE_STATUS_TERMINATED);
- String outSequenceID = internalSequenceBean.getSequenceID();
+ String outSequenceID =
internalSequenceBean.getSequencePropertyKey();
fillOutgoingSequenceInfo(report, outSequenceID, seqPropMgr);
}
@@ -875,7 +875,7 @@
}
report.setSequenceStatus(SequenceReport.SEQUENCE_STATUS_TIMED_OUT);
- String outSequenceID = internalSequenceBean.getSequenceID();
+ String outSequenceID =
internalSequenceBean.getSequencePropertyKey();
fillOutgoingSequenceInfo(report, outSequenceID, seqPropMgr);
}
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=442863&r1=442862&r2=442863
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java
Tue Sep 12 23:29:07 2006
@@ -236,7 +236,7 @@
long msgNo =
sequence.getMessageNumber().getMessageNumber();
- String propertyKey =
SandeshaUtil.getPropertyKey(rmMsgContext);
+ String propertyKey =
SandeshaUtil.getSequencePropertyKey(rmMsgContext);
if (propertyKey != null && msgNo > 0) {
SequencePropertyBeanMgr seqPropMgr =
storageManager.getSequencePropertyBeanMgr();
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java?view=diff&rev=442863&r1=442862&r2=442863
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
Tue Sep 12 23:29:07 2006
@@ -112,6 +112,13 @@
log.debug(message);
throw new SandeshaException(message);
}
+
+ String internalSequenceId =
SandeshaUtil.getSequenceProperty(outSequenceId,
+
Sandesha2Constants.SequenceProperties.INTERNAL_SEQUENCE_ID, storageManager);
+
+ //here we cannot get the property key using the usual
SandeshaUtil.getSequencePropertyKey function,
+ //because this can be a applicationMessage, which piggybacks
the acknowledgement.
+ String sequencePropertyKey = internalSequenceId;
// Check that the sender of this Ack holds the correct token
SequencePropertyBean tokenBean =
seqPropMgr.retrieve(outSequenceId,
Sandesha2Constants.SequenceProperties.SECURITY_TOKEN);
@@ -150,22 +157,8 @@
return;
}
- String internalSequenceID =
SandeshaUtil.getSequenceProperty(outSequenceId,
-
Sandesha2Constants.SequenceProperties.INTERNAL_SEQUENCE_ID, storageManager);
-
// updating the last activated time of the sequence.
- SequenceManager.updateLastActivatedTime(internalSequenceID,
storageManager);
-
- SequencePropertyBean internalSequenceBean =
seqPropMgr.retrieve(outSequenceId,
-
Sandesha2Constants.SequenceProperties.INTERNAL_SEQUENCE_ID);
-
- if (internalSequenceBean == null ||
internalSequenceBean.getValue() == null) {
- String message =
SandeshaMessageHelper.getMessage(SandeshaMessageKeys.tempSeqIdNotSet);
- log.debug(message);
- throw new SandeshaException(message);
- }
-
- String internalSequenceId = (String)
internalSequenceBean.getValue();
+ SequenceManager.updateLastActivatedTime(sequencePropertyKey,
storageManager);
SenderBean input = new SenderBean();
input.setSend(true);
@@ -202,14 +195,14 @@
// setting acked message date.
// TODO add details specific to each message.
long noOfMsgsAcked =
getNoOfMessagesAcked(sequenceAck.getAcknowledgementRanges().iterator());
- SequencePropertyBean noOfMsgsAckedBean =
seqPropMgr.retrieve(outSequenceId,
+ SequencePropertyBean noOfMsgsAckedBean =
seqPropMgr.retrieve(sequencePropertyKey,
Sandesha2Constants.SequenceProperties.NO_OF_OUTGOING_MSGS_ACKED);
boolean added = false;
if (noOfMsgsAckedBean == null) {
added = true;
noOfMsgsAckedBean = new SequencePropertyBean();
- noOfMsgsAckedBean.setSequenceID(outSequenceId);
+
noOfMsgsAckedBean.setSequencePropertyKey(sequencePropertyKey);
noOfMsgsAckedBean.setName(Sandesha2Constants.SequenceProperties.NO_OF_OUTGOING_MSGS_ACKED);
}
@@ -222,11 +215,11 @@
// setting the completed_messages list. This gives all the
messages of
// the sequence that were acked.
- SequencePropertyBean allCompletedMsgsBean =
seqPropMgr.retrieve(internalSequenceId,
+ SequencePropertyBean allCompletedMsgsBean =
seqPropMgr.retrieve(sequencePropertyKey,
Sandesha2Constants.SequenceProperties.CLIENT_COMPLETED_MESSAGES);
if (allCompletedMsgsBean == null) {
allCompletedMsgsBean = new SequencePropertyBean();
- allCompletedMsgsBean.setSequenceID(internalSequenceId);
+
allCompletedMsgsBean.setSequencePropertyKey(sequencePropertyKey);
allCompletedMsgsBean.setName(Sandesha2Constants.SequenceProperties.CLIENT_COMPLETED_MESSAGES);
seqPropMgr.insert(allCompletedMsgsBean);
@@ -237,7 +230,7 @@
seqPropMgr.update(allCompletedMsgsBean);
- String lastOutMsgNoStr =
SandeshaUtil.getSequenceProperty(internalSequenceId,
+ String lastOutMsgNoStr =
SandeshaUtil.getSequenceProperty(sequencePropertyKey,
Sandesha2Constants.SequenceProperties.LAST_OUT_MESSAGE_NO, storageManager);
if (lastOutMsgNoStr != null) {
long highestOutMsgNo = 0;
@@ -250,7 +243,7 @@
.getAcknowledgementRanges().iterator(), highestOutMsgNo);
if (complete)
-
TerminateManager.addTerminateSequenceMessage(rmMsgCtx, outSequenceId,
internalSequenceId,
+
TerminateManager.addTerminateSequenceMessage(rmMsgCtx, outSequenceId,
sequencePropertyKey,
storageManager);
}
}
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=442863&r1=442862&r2=442863
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
Tue Sep 12 23:29:07 2006
@@ -116,8 +116,10 @@
Sequence sequence = (Sequence)
rmMsgCtx.getMessagePart(Sandesha2Constants.MessageParts.SEQUENCE);
String sequenceId = sequence.getIdentifier().getIdentifier();
+ String propertyKey =
SandeshaUtil.getSequencePropertyKey(rmMsgCtx);
+
// Check that both the Sequence header and message body have
been secured properly
- SequencePropertyBean tokenBean =
seqPropMgr.retrieve(sequenceId,
Sandesha2Constants.SequenceProperties.SECURITY_TOKEN);
+ SequencePropertyBean tokenBean =
seqPropMgr.retrieve(propertyKey,
Sandesha2Constants.SequenceProperties.SECURITY_TOKEN);
if(tokenBean != null) {
SecurityManager secManager =
SandeshaUtil.getSecurityManager(msgCtx.getConfigurationContext());
OMElement body = msgCtx.getEnvelope().getBody();
@@ -198,9 +200,9 @@
}
// updating the last activated time of the sequence.
- SequenceManager.updateLastActivatedTime(sequenceId,
storageManager);
+ SequenceManager.updateLastActivatedTime(propertyKey,
storageManager);
- SequencePropertyBean msgsBean = seqPropMgr.retrieve(sequenceId,
+ SequencePropertyBean msgsBean = seqPropMgr.retrieve(propertyKey,
Sandesha2Constants.SequenceProperties.SERVER_COMPLETED_MESSAGES);
long msgNo = sequence.getMessageNumber().getMessageNumber();
@@ -215,9 +217,9 @@
// updating the Highest_In_Msg_No property which gives the
highest
// message number retrieved from this sequence.
- String highetsInMsgNoStr =
SandeshaUtil.getSequenceProperty(sequenceId,
+ String highetsInMsgNoStr =
SandeshaUtil.getSequenceProperty(propertyKey,
Sandesha2Constants.SequenceProperties.HIGHEST_IN_MSG_NUMBER, storageManager);
- String highetsInMsgKey =
SandeshaUtil.getSequenceProperty(sequenceId,
+ String highetsInMsgKey =
SandeshaUtil.getSequenceProperty(propertyKey,
Sandesha2Constants.SequenceProperties.HIGHEST_IN_MSG_KEY, storageManager);
if (highetsInMsgKey == null)
highetsInMsgKey = SandeshaUtil.getUUID();
@@ -231,9 +233,9 @@
highestInMsgNo = msgNo;
String str = new Long(msgNo).toString();
- SequencePropertyBean highestMsgNoBean = new
SequencePropertyBean(sequenceId,
+ SequencePropertyBean highestMsgNoBean = new
SequencePropertyBean(propertyKey,
Sandesha2Constants.SequenceProperties.HIGHEST_IN_MSG_NUMBER, str);
- SequencePropertyBean highestMsgKeyBean = new
SequencePropertyBean(sequenceId,
+ SequencePropertyBean highestMsgKeyBean = new
SequencePropertyBean(propertyKey,
Sandesha2Constants.SequenceProperties.HIGHEST_IN_MSG_KEY, highetsInMsgKey);
// storing the new message as the highest in message.
@@ -254,7 +256,7 @@
messagesStr = (String) msgsBean.getValue();
else {
msgsBean = new SequencePropertyBean();
- msgsBean.setSequenceID(sequenceId);
+ msgsBean.setSequencePropertyKey(propertyKey);
msgsBean.setName(Sandesha2Constants.SequenceProperties.SERVER_COMPLETED_MESSAGES);
msgsBean.setValue(messagesStr);
}
@@ -303,7 +305,7 @@
if (incomingSequenceListBean == null) {
ArrayList incomingSequenceList = new
ArrayList();
incomingSequenceListBean = new
SequencePropertyBean();
-
incomingSequenceListBean.setSequenceID(Sandesha2Constants.SequenceProperties.ALL_SEQUENCES);
+
incomingSequenceListBean.setSequencePropertyKey(Sandesha2Constants.SequenceProperties.ALL_SEQUENCES);
incomingSequenceListBean.setName(Sandesha2Constants.SequenceProperties.INCOMING_SEQUENCE_LIST);
incomingSequenceListBean.setValue(incomingSequenceList.toString());
@@ -504,7 +506,7 @@
if (internalSequenceId!=null)
rmMsgCtx.setProperty(Sandesha2Constants.MessageContextProperties.INTERNAL_SEQUENCE_ID,internalSequenceId);
- String propertyKey = SandeshaUtil.getPropertyKey(rmMsgCtx);
+ String propertyKey =
SandeshaUtil.getSequencePropertyKey(rmMsgCtx);
/*
* checking weather the user has given the messageNumber (most
of the
@@ -808,7 +810,7 @@
SequencePropertyBean offeredSequenceBean = new
SequencePropertyBean();
offeredSequenceBean.setName(Sandesha2Constants.SequenceProperties.OFFERED_SEQUENCE);
- offeredSequenceBean.setSequenceID(internalSequenceId);
+
offeredSequenceBean.setSequencePropertyKey(internalSequenceId);
offeredSequenceBean.setValue(offeredSequenceId);
seqPropMgr.insert(offeredSequenceBean);
@@ -1134,7 +1136,7 @@
if (nextMsgNoBean == null) {
update = false;
nextMsgNoBean = new SequencePropertyBean();
- nextMsgNoBean.setSequenceID(internalSequenceId);
+
nextMsgNoBean.setSequencePropertyKey(internalSequenceId);
nextMsgNoBean.setName(Sandesha2Constants.SequenceProperties.NEXT_MESSAGE_NUMBER);
}
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java?view=diff&rev=442863&r1=442862&r2=442863
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java
Tue Sep 12 23:29:07 2006
@@ -97,7 +97,7 @@
}
SequencePropertyBean sequenceClosedBean = new
SequencePropertyBean();
- sequenceClosedBean.setSequenceID(sequenceID);
+ sequenceClosedBean.setSequencePropertyKey(sequenceID);
sequenceClosedBean.setName(Sandesha2Constants.SequenceProperties.SEQUENCE_CLOSED);
sequenceClosedBean.setValue(Sandesha2Constants.VALUE_TRUE);
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=442863&r1=442862&r2=442863
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
Tue Sep 12 23:29:07 2006
@@ -183,13 +183,13 @@
SequencePropertyBean outSequenceBean =
new SequencePropertyBean();
outSequenceBean.setName(Sandesha2Constants.SequenceProperties.OUT_SEQUENCE_ID);
outSequenceBean.setValue(offeredSequenceID);
-
outSequenceBean.setSequenceID(outgoingSideInternalSequenceID);
+
outSequenceBean.setSequencePropertyKey(outgoingSideInternalSequenceID);
seqPropMgr.insert(outSequenceBean);
// setting the internal_sequence_id
SequencePropertyBean
internalSequenceBean = new SequencePropertyBean();
internalSequenceBean.setName(Sandesha2Constants.SequenceProperties.INTERNAL_SEQUENCE_ID);
-
internalSequenceBean.setSequenceID(offeredSequenceID);
+
internalSequenceBean.setSequencePropertyKey(offeredSequenceID);
internalSequenceBean.setValue(outgoingSideInternalSequenceID);
seqPropMgr.insert(internalSequenceBean);
} else {
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java?view=diff&rev=442863&r1=442862&r2=442863
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
Tue Sep 12 23:29:07 2006
@@ -179,7 +179,7 @@
EndpointReference acksToEPR =
accept.getAcksTo().getAddress().getEpr();
SequencePropertyBean acksToBean = new
SequencePropertyBean();
acksToBean.setName(Sandesha2Constants.SequenceProperties.ACKS_TO_EPR);
- acksToBean.setSequenceID(offeredSequenceId);
+ acksToBean.setSequencePropertyKey(offeredSequenceId);
acksToBean.setValue(acksToEPR.getAddress());
sequencePropMgr.insert(acksToBean);
@@ -202,7 +202,7 @@
sequencePropMgr.insert(receivedMsgBean);
SequencePropertyBean msgsBean = new
SequencePropertyBean();
- msgsBean.setSequenceID(offeredSequenceId);
+ msgsBean.setSequencePropertyKey(offeredSequenceId);
msgsBean.setName(Sandesha2Constants.SequenceProperties.CLIENT_COMPLETED_MESSAGES);
msgsBean.setValue("");
sequencePropMgr.insert(msgsBean);
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=442863&r1=442862&r2=442863
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
Tue Sep 12 23:29:07 2006
@@ -129,7 +129,7 @@
SequencePropertyBean terminateReceivedBean = new
SequencePropertyBean();
- terminateReceivedBean.setSequenceID(sequenceId);
+ terminateReceivedBean.setSequencePropertyKey(sequenceId);
terminateReceivedBean.setName(Sandesha2Constants.SequenceProperties.TERMINATE_RECEIVED);
terminateReceivedBean.setValue("true");
@@ -436,7 +436,7 @@
SequencePropertyBean terminateAdded = new
SequencePropertyBean();
terminateAdded.setName(Sandesha2Constants.SequenceProperties.TERMINATE_ADDED);
- terminateAdded.setSequenceID(outSequenceID);
+ terminateAdded.setSequencePropertyKey(outSequenceID);
terminateAdded.setValue("true");
seqPropMgr.insert(terminateAdded);
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/SequencePropertyBean.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/SequencePropertyBean.java?view=diff&rev=442863&r1=442862&r2=442863
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/SequencePropertyBean.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/SequencePropertyBean.java
Tue Sep 12 23:29:07 2006
@@ -24,10 +24,14 @@
public class SequencePropertyBean extends RMBean {
/**
- * Comment for <code>sequenceID</code>
- * Sequence ID of the sequence this property belong to.
+ * Comment for <code>sequencePropertyKey</code>
+ * The key used to store properties of this sequence.
+ * The value depends on the endpoint as given below.
+ *
+ * RMS (sending side) - internalSequenceId
+ * RMD - sequenceId
*/
- private String sequenceID;
+ private String sequencePropertyKey;
/**
* Comment for <code>name</code>
@@ -42,7 +46,7 @@
private String value;
public SequencePropertyBean(String seqID, String propertyName, String
value) {
- this.sequenceID = seqID;
+ this.sequencePropertyKey = seqID;
this.name = propertyName;
this.value = value;
}
@@ -59,12 +63,12 @@
this.name = name;
}
- public String getSequenceID() {
- return sequenceID;
+ public String getSequencePropertyKey() {
+ return sequencePropertyKey;
}
- public void setSequenceID(String sequenceID) {
- this.sequenceID = sequenceID;
+ public void setSequencePropertyKey(String sequencePropertyKey) {
+ this.sequencePropertyKey = sequencePropertyKey;
}
public String getValue() {
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemorySequencePropertyBeanMgr.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemorySequencePropertyBeanMgr.java?view=diff&rev=442863&r1=442862&r2=442863
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemorySequencePropertyBeanMgr.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemorySequencePropertyBeanMgr.java
Tue Sep 12 23:29:07 2006
@@ -60,7 +60,7 @@
}
public synchronized boolean insert(SequencePropertyBean bean) {
- table.put(bean.getSequenceID() + ":" + bean.getName(), bean);
+ table.put(bean.getSequencePropertyKey() + ":" + bean.getName(),
bean);
return true;
}
@@ -83,8 +83,8 @@
boolean equal = true;
- if (bean.getSequenceID() != null
- &&
!bean.getSequenceID().equals(temp.getSequenceID()))
+ if (bean.getSequencePropertyKey() != null
+ &&
!bean.getSequencePropertyKey().equals(temp.getSequencePropertyKey()))
equal = false;
if (bean.getName() != null
@@ -121,7 +121,7 @@
}
private String getId(SequencePropertyBean bean) {
- return bean.getSequenceID() + ":" + bean.getName();
+ return bean.getSequencePropertyKey() + ":" + bean.getName();
}
public synchronized SequencePropertyBean
findUnique(SequencePropertyBean bean) throws SandeshaException {
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/FaultManager.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/FaultManager.java?view=diff&rev=442863&r1=442862&r2=442863
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/FaultManager.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/FaultManager.java
Tue Sep 12 23:29:07 2006
@@ -288,50 +288,57 @@
boolean invalidAck = false;
String reason = null;
- SequenceAcknowledgement sequenceAcknowledgement =
(SequenceAcknowledgement) ackRMMessageContext
-
.getMessagePart(Sandesha2Constants.MessageParts.SEQ_ACKNOWLEDGEMENT);
- List sequenceAckList =
sequenceAcknowledgement.getAcknowledgementRanges();
- Iterator it = sequenceAckList.iterator();
-
- while (it.hasNext()) {
- AcknowledgementRange acknowledgementRange =
(AcknowledgementRange) it.next();
- long upper = acknowledgementRange.getUpperValue();
- long lower = acknowledgementRange.getLowerValue();
-
- if (lower > upper) {
- invalidAck = true;
- reason =
SandeshaMessageHelper.getMessage(SandeshaMessageKeys.ackInvalid,
Long.toString(lower), Long
- .toString(upper));
+
+ Iterator sequenceAckIter = ackRMMessageContext.getMessageParts(
+
Sandesha2Constants.MessageParts.SEQ_ACKNOWLEDGEMENT);
+
+ while (sequenceAckIter.hasNext()) {
+ SequenceAcknowledgement sequenceAcknowledgement =
(SequenceAcknowledgement) sequenceAckIter.next();
+ List sequenceAckList =
sequenceAcknowledgement.getAcknowledgementRanges();
+ Iterator it = sequenceAckList.iterator();
+
+ while (it.hasNext()) {
+ AcknowledgementRange acknowledgementRange =
(AcknowledgementRange) it.next();
+ long upper =
acknowledgementRange.getUpperValue();
+ long lower =
acknowledgementRange.getLowerValue();
+
+ if (lower > upper) {
+ invalidAck = true;
+ reason =
SandeshaMessageHelper.getMessage(SandeshaMessageKeys.ackInvalid,
Long.toString(lower), Long
+ .toString(upper));
+ }
}
- }
- if (invalidAck) {
- FaultData data = new FaultData();
- int SOAPVersion =
SandeshaUtil.getSOAPVersion(ackMessageContext.getEnvelope());
- if (SOAPVersion == Sandesha2Constants.SOAPVersion.v1_1)
- data.setCode(SOAP11Constants.FAULT_CODE_SENDER);
- else
- data.setCode(SOAP12Constants.FAULT_CODE_SENDER);
-
-
data.setSubcode(Sandesha2Constants.SOAPFaults.Subcodes.INVALID_ACKNOWLEDGEMENT);
- data.setReason(reason);
-
- SOAPFactory factory =
SOAPAbstractFactory.getSOAPFactory(SOAPVersion);
- OMElement dummyElement =
factory.createOMElement("dummyElem", null);
- sequenceAcknowledgement.toOMElement(dummyElement);
-
- OMElement sequenceAckElement =
dummyElement.getFirstChildWithName(new QName(
-
Sandesha2Constants.WSRM_COMMON.SEQUENCE_ACK));
- data.setDetail(sequenceAckElement);
-
- if (log.isDebugEnabled())
- log.debug("Exit:
FaultManager::checkForInvalidAcknowledgement, invalid ACK");
- return getFault(ackRMMessageContext, data,
ackRMMessageContext.getAddressingNamespaceValue(),
- storageManager);
+ if (invalidAck) {
+ FaultData data = new FaultData();
+ int SOAPVersion =
SandeshaUtil.getSOAPVersion(ackMessageContext.getEnvelope());
+ if (SOAPVersion ==
Sandesha2Constants.SOAPVersion.v1_1)
+
data.setCode(SOAP11Constants.FAULT_CODE_SENDER);
+ else
+
data.setCode(SOAP12Constants.FAULT_CODE_SENDER);
+
+
data.setSubcode(Sandesha2Constants.SOAPFaults.Subcodes.INVALID_ACKNOWLEDGEMENT);
+ data.setReason(reason);
+
+ SOAPFactory factory =
SOAPAbstractFactory.getSOAPFactory(SOAPVersion);
+ OMElement dummyElement =
factory.createOMElement("dummyElem", null);
+
sequenceAcknowledgement.toOMElement(dummyElement);
+
+ OMElement sequenceAckElement =
dummyElement.getFirstChildWithName(new QName(
+
Sandesha2Constants.WSRM_COMMON.SEQUENCE_ACK));
+ data.setDetail(sequenceAckElement);
+
+ if (log.isDebugEnabled())
+ log.debug("Exit:
FaultManager::checkForInvalidAcknowledgement, invalid ACK");
+ return getFault(ackRMMessageContext, data,
ackRMMessageContext.getAddressingNamespaceValue(),
+ storageManager);
+ }
+
}
if (log.isDebugEnabled())
log.debug("Exit:
FaultManager::checkForInvalidAcknowledgement");
+
return null;
}
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/MsgInitializer.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/MsgInitializer.java?view=diff&rev=442863&r1=442862&r2=442863
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/MsgInitializer.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/MsgInitializer.java
Tue Sep 12 23:29:07 2006
@@ -106,7 +106,9 @@
rmNamespace =
elements.getSequence().getNamespaceValue();
}
-
+ //In case of ack messages RM Namespace is decided based on the
sequenceId of the first
+ //sequence Ack. In other words Sandesha2 does not expect to
receive two SequenceAcknowledgements
+ //of different RM specifications in the same incoming message
for (Iterator iter =
elements.getSequenceAcknowledgements();iter.hasNext();) {
SequenceAcknowledgement sequenceAck =
(SequenceAcknowledgement) iter.next();
rmMsgContext.setMessagePart(Sandesha2Constants.MessageParts.SEQ_ACKNOWLEDGEMENT,
sequenceAck);
@@ -219,8 +221,9 @@
rmMsgCtx.setMessageType(Sandesha2Constants.MessageTypes.ACK);
SequenceAcknowledgement sequenceAcknowledgement =
(SequenceAcknowledgement) sequenceAcknowledgementsIter.next();
- //picking the sequenceId of the first sequence ack.
- sequenceID =
sequenceAcknowledgement.getIdentifier().getIdentifier();
+ //if there is only on sequenceAck, sequenceId will be
set. Otherwise it will not be.
+ if (!sequenceAcknowledgementsIter.hasNext())
+ sequenceID =
sequenceAcknowledgement.getIdentifier().getIdentifier();
} else if (ackRequest != null) {
rmMsgCtx.setMessageType(Sandesha2Constants.MessageTypes.ACK_REQUEST);
sequenceID = ackRequest.getIdentifier().getIdentifier();
@@ -246,28 +249,6 @@
if (sequenceID!=null)
rmMsgCtx.setProperty(Sandesha2Constants.MessageContextProperties.SEQUENCE_ID,sequenceID);
-
- String propertyKey = SandeshaUtil.getPropertyKey(rmMsgCtx);
-
- //In case of ack messages RM Namespace is decided based on the
sequenceId of the first
- //sequence Ack. In other words Sandesha2 does not expect to
receive two SequenceAcknowledgements
- //of different RM specifications in the same incoming message.
-
- String rmNamespace = rmMsgCtx.getRMNamespaceValue();
- if (sequenceID != null) {
- String specVersion =
SandeshaUtil.getRMVersion(propertyKey, storageManager);
-
- String sequenceRMNamespace = null;
- if (specVersion != null)
- sequenceRMNamespace =
SpecSpecificConstants.getRMNamespaceValue(specVersion);
- if (sequenceRMNamespace != null && rmNamespace != null)
{
- if (!sequenceRMNamespace.equals(rmNamespace)) {
- throw new
SandeshaException(SandeshaMessageHelper.getMessage(
-
SandeshaMessageKeys.rmNamespaceNotMatchSequence, rmNamespace,
sequenceRMNamespace,
- sequenceID));
- }
- }
- }
return true;
}
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java?view=diff&rev=442863&r1=442862&r2=442863
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java
Tue Sep 12 23:29:07 2006
@@ -348,7 +348,7 @@
* @throws SandeshaException
*/
public static RMMsgContext createTerminateSequenceMessage(RMMsgContext
referenceRMMessage, String sequenceId,
- String internalSequenceID, StorageManager
storageManager) throws SandeshaException {
+ String sequencePropertyKey, StorageManager
storageManager) throws SandeshaException {
MessageContext referenceMessage =
referenceRMMessage.getMessageContext();
if (referenceMessage == null)
throw new
SandeshaException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.msgContextNotSet));
@@ -389,7 +389,7 @@
terminateMsgOperation.setRemainingPhasesInFlow(teferenceMsgOperation.getRemainingPhasesInFlow());
}
- String rmVersion =
SandeshaUtil.getRMVersion(internalSequenceID, storageManager);
+ String rmVersion =
SandeshaUtil.getRMVersion(sequencePropertyKey, storageManager);
if (rmVersion == null)
throw new
SandeshaException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.cannotDecideRMVersion));
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java?view=diff&rev=442863&r1=442862&r2=442863
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java
Tue Sep 12 23:29:07 2006
@@ -440,13 +440,14 @@
// TODO make this spec indipendent
OMElement sequenceElem = null;
- if (header != null)
+ if (header != null) {
sequenceElem = header.getFirstChildWithName(new
QName(Sandesha2Constants.SPEC_2005_02.NS_URI,
-
Sandesha2Constants.WSRM_COMMON.SEQUENCE));
+
Sandesha2Constants.WSRM_COMMON.SEQUENCE));
- if (sequenceElem == null)
- sequenceElem = header.getFirstChildWithName(new
QName(Sandesha2Constants.SPEC_2006_08.NS_URI,
-
Sandesha2Constants.WSRM_COMMON.SEQUENCE));
+ if (sequenceElem == null)
+ sequenceElem = header.getFirstChildWithName(new
QName(Sandesha2Constants.SPEC_2006_08.NS_URI,
+
Sandesha2Constants.WSRM_COMMON.SEQUENCE));
+ }
if (sequenceElem != null)
rmGlobalMsg = true;
@@ -961,7 +962,7 @@
* @return
*/
- public static String getPropertyKey (RMMsgContext rmMsgContext) {
+ public static String getSequencePropertyKey (RMMsgContext rmMsgContext)
{
String sequenceId = (String)
rmMsgContext.getProperty(Sandesha2Constants.MessageContextProperties.SEQUENCE_ID);
String internalSequenceId = (String)
rmMsgContext.getProperty(Sandesha2Constants.MessageContextProperties.INTERNAL_SEQUENCE_ID);
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java?view=diff&rev=442863&r1=442862&r2=442863
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java
Tue Sep 12 23:29:07 2006
@@ -139,7 +139,7 @@
}
SequencePropertyBean specVerionBean = new
SequencePropertyBean();
- specVerionBean.setSequenceID(sequenceId);
+ specVerionBean.setSequencePropertyKey(sequenceId);
specVerionBean.setName(Sandesha2Constants.SequenceProperties.RM_SPEC_VERSION);
specVerionBean.setValue(specVersion);
@@ -288,7 +288,7 @@
}
SequencePropertyBean msgsBean = new SequencePropertyBean();
- msgsBean.setSequenceID(internalSequenceId);
+ msgsBean.setSequencePropertyKey(internalSequenceId);
msgsBean.setName(Sandesha2Constants.SequenceProperties.CLIENT_COMPLETED_MESSAGES);
msgsBean.setValue("");
@@ -304,7 +304,7 @@
String transportTo = (String)
firstAplicationMsgCtx.getProperty(MessageContextConstants.TRANSPORT_URL);
if (transportTo != null) {
SequencePropertyBean transportToBean = new
SequencePropertyBean();
- transportToBean.setSequenceID(internalSequenceId);
+
transportToBean.setSequencePropertyKey(internalSequenceId);
transportToBean.setName(Sandesha2Constants.SequenceProperties.TRANSPORT_TO);
transportToBean.setValue(transportTo);
@@ -313,7 +313,7 @@
// setting the spec version for the client side.
SequencePropertyBean specVerionBean = new
SequencePropertyBean();
- specVerionBean.setSequenceID(internalSequenceId);
+ specVerionBean.setSequencePropertyKey(internalSequenceId);
specVerionBean.setName(Sandesha2Constants.SequenceProperties.RM_SPEC_VERSION);
specVerionBean.setValue(specVersion);
seqPropMgr.insert(specVerionBean);
@@ -420,7 +420,7 @@
if (lastActivatedBean == null) {
added = true;
lastActivatedBean = new SequencePropertyBean();
- lastActivatedBean.setSequenceID(propertyKey);
+ lastActivatedBean.setSequencePropertyKey(propertyKey);
lastActivatedBean.setName(Sandesha2Constants.SequenceProperties.LAST_ACTIVATED_TIME);
}
@@ -470,34 +470,12 @@
return sequenceTimedOut;
}
- public static long getOutGoingSequenceAckedMessageCount(String
internalSequenceID, StorageManager storageManager)
+ public static long getOutGoingSequenceAckedMessageCount(String
sequencePropertyKey, StorageManager storageManager)
throws SandeshaException {
// / Transaction transaction = storageManager.getTransaction();
SequencePropertyBeanMgr seqPropBeanMgr =
storageManager.getSequencePropertyBeanMgr();
- SequencePropertyBean findSeqIDBean = new SequencePropertyBean();
- findSeqIDBean.setValue(internalSequenceID);
-
findSeqIDBean.setName(Sandesha2Constants.SequenceProperties.INTERNAL_SEQUENCE_ID);
- Collection seqIDBeans = seqPropBeanMgr.find(findSeqIDBean);
-
- if (seqIDBeans.size() == 0) {
- String message =
SandeshaMessageHelper.getMessage(SandeshaMessageKeys.noSequenceEstablished,
- internalSequenceID);
- log.debug(message);
- throw new SandeshaException(message);
- }
-
- if (seqIDBeans.size() > 1) {
- String message = SandeshaMessageHelper.getMessage(
-
SandeshaMessageKeys.cannotGenerateReportNonUniqueSequence, internalSequenceID);
- log.debug(message);
- throw new SandeshaException(message);
- }
-
- SequencePropertyBean seqIDBean = (SequencePropertyBean)
seqIDBeans.iterator().next();
- String sequenceID = seqIDBean.getSequenceID();
-
- SequencePropertyBean ackedMsgBean =
seqPropBeanMgr.retrieve(sequenceID,
+ SequencePropertyBean ackedMsgBean =
seqPropBeanMgr.retrieve(sequencePropertyKey,
Sandesha2Constants.SequenceProperties.NO_OF_OUTGOING_MSGS_ACKED);
if (ackedMsgBean == null)
return 0; // No acknowledgement has been received yet.
@@ -532,7 +510,7 @@
}
SequencePropertyBean seqIDBean = (SequencePropertyBean)
seqIDBeans.iterator().next();
- String sequenceID = seqIDBean.getSequenceID();
+ String sequenceID = seqIDBean.getSequencePropertyKey();
SequencePropertyBean terminateAddedBean =
seqPropBeanMgr.retrieve(sequenceID,
Sandesha2Constants.SequenceProperties.TERMINATE_ADDED);
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java?view=diff&rev=442863&r1=442862&r2=442863
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java
Tue Sep 12 23:29:07 2006
@@ -240,7 +240,7 @@
// so saving it with the sequenceID value being the out
sequenceID.
SequencePropertyBean newBean = new
SequencePropertyBean();
- newBean.setSequenceID(sequenceID);
+ newBean.setSequencePropertyKey(sequenceID);
newBean.setName(propertyBean.getName());
newBean.setValue(propertyBean.getValue());
@@ -248,7 +248,7 @@
// TODO amazingly this property does not seem to get
deleted without
// following - in the hibernate impl
// (even though the lines efter current methodcall do
this).
- seqPropMgr.delete(propertyBean.getSequenceID(),
propertyBean.getName());
+
seqPropMgr.delete(propertyBean.getSequencePropertyKey(),
propertyBean.getName());
}
}
@@ -341,7 +341,7 @@
// removing sequence properties
SequencePropertyBean findSequencePropertyBean1 = new
SequencePropertyBean();
- findSequencePropertyBean1.setSequenceID(internalSequenceID);
+
findSequencePropertyBean1.setSequencePropertyKey(internalSequenceID);
collection =
sequencePropertyBeanMgr.find(findSequencePropertyBean1);
iterator = collection.iterator();
while (iterator.hasNext()) {
@@ -351,13 +351,13 @@
// TODO all properties which hv the temm:Seq:id as the
key should be
// deletable.
if
(isPropertyDeletable(sequencePropertyBean.getName())) {
-
sequencePropertyBeanMgr.delete(sequencePropertyBean.getSequenceID(),
sequencePropertyBean.getName());
+
sequencePropertyBeanMgr.delete(sequencePropertyBean.getSequencePropertyKey(),
sequencePropertyBean.getName());
}
}
}
public static void addTerminateSequenceMessage(RMMsgContext
referenceMessage, String outSequenceId,
- String internalSequenceId, StorageManager
storageManager) throws SandeshaException {
+ String sequencePropertyKey, StorageManager
storageManager) throws SandeshaException {
ConfigurationContext configurationContext =
referenceMessage.getMessageContext().getConfigurationContext();
@@ -375,11 +375,11 @@
}
RMMsgContext terminateRMMessage =
RMMsgCreator.createTerminateSequenceMessage(referenceMessage, outSequenceId,
- internalSequenceId, storageManager);
+ sequencePropertyKey, storageManager);
terminateRMMessage.setFlow(MessageContext.OUT_FLOW);
terminateRMMessage.setProperty(Sandesha2Constants.APPLICATION_PROCESSING_DONE,
"true");
- SequencePropertyBean toBean =
seqPropMgr.retrieve(internalSequenceId,
+ SequencePropertyBean toBean =
seqPropMgr.retrieve(sequencePropertyKey,
Sandesha2Constants.SequenceProperties.TO_EPR);
EndpointReference toEPR = new
EndpointReference(toBean.getValue());
@@ -390,17 +390,17 @@
terminateRMMessage.setTo(new
EndpointReference(toEPR.getAddress()));
- String addressingNamespaceURI =
SandeshaUtil.getSequenceProperty(internalSequenceId,
+ String addressingNamespaceURI =
SandeshaUtil.getSequenceProperty(sequencePropertyKey,
Sandesha2Constants.SequenceProperties.ADDRESSING_NAMESPACE_VALUE,
storageManager);
String anonymousURI =
SpecSpecificConstants.getAddressingAnonymousURI(addressingNamespaceURI);
- String rmVersion =
SandeshaUtil.getRMVersion(internalSequenceId, storageManager);
+ String rmVersion =
SandeshaUtil.getRMVersion(sequencePropertyKey, storageManager);
if (rmVersion == null)
throw new
SandeshaException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.cannotDecideRMVersion));
terminateRMMessage.setWSAAction(SpecSpecificConstants.getTerminateSequenceAction(rmVersion));
terminateRMMessage.setSOAPAction(SpecSpecificConstants.getTerminateSequenceSOAPAction(rmVersion));
- SequencePropertyBean transportToBean =
seqPropMgr.retrieve(internalSequenceId,
+ SequencePropertyBean transportToBean =
seqPropMgr.retrieve(sequencePropertyKey,
Sandesha2Constants.SequenceProperties.TRANSPORT_TO);
if (transportToBean != null) {
terminateRMMessage.setProperty(MessageContextConstants.TRANSPORT_URL,
transportToBean.getValue());
@@ -441,7 +441,7 @@
SequencePropertyBean terminateAdded = new
SequencePropertyBean();
terminateAdded.setName(Sandesha2Constants.SequenceProperties.TERMINATE_ADDED);
- terminateAdded.setSequenceID(outSequenceId);
+ terminateAdded.setSequencePropertyKey(outSequenceId);
terminateAdded.setValue("true");
seqPropMgr.insert(terminateAdded);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
