Author: chamikara
Date: Sun Feb 12 23:56:26 2006
New Revision: 377319
URL: http://svn.apache.org/viewcvs?rev=377319&view=rev
Log:
Corrected mustUnderstand processing logic
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/TerminateManager.java
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
webservices/sandesha/trunk/src/org/apache/sandesha2/util/SequenceManager.java
webservices/sandesha/trunk/src/org/apache/sandesha2/workers/InOrderInvoker.java
webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Sequence.java
webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/TerminateManager.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/TerminateManager.java?rev=377319&r1=377318&r2=377319&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/TerminateManager.java
(original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/TerminateManager.java
Sun Feb 12 23:56:26 2006
@@ -137,7 +137,7 @@
Iterator iterator = collection.iterator();
while (iterator.hasNext()) {
NextMsgBean nextMsgBean = (NextMsgBean) iterator.next();
- //nextMsgBeanMgr.delete(nextMsgBean.getSequenceID());
+ nextMsgBeanMgr.delete(nextMsgBean.getSequenceID());
}
removeReceivingSideProperties(configContext,sequenceID);
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java?rev=377319&r1=377318&r2=377319&view=diff
==============================================================================
---
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
(original)
+++
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
Sun Feb 12 23:56:26 2006
@@ -75,6 +75,10 @@
log.debug(message);
throw new SandeshaException(message);
}
+
+ //setting mustUnderstand to false.
+ sequenceAck.setMustUnderstand(false);
+ rmMsgCtx.addSOAPEnvelope();
StorageManager storageManager = SandeshaUtil
.getSandeshaStorageManager(rmMsgCtx.getMessageContext()
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java?rev=377319&r1=377318&r2=377319&view=diff
==============================================================================
---
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
Sun Feb 12 23:56:26 2006
@@ -131,6 +131,11 @@
}
+
+ //setting mustUnderstand to false.
+ sequence.setMustUnderstand(false);
+ rmMsgCtx.addSOAPEnvelope();
+
Transaction lastUpdatedTimeTransaction =
storageManager.getTransaction();
//updating the last activated time of the sequence.
SequenceManager.updateLastActivatedTime(sequenceId,configCtx);
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/util/SequenceManager.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/SequenceManager.java?rev=377319&r1=377318&r2=377319&view=diff
==============================================================================
---
webservices/sandesha/trunk/src/org/apache/sandesha2/util/SequenceManager.java
(original)
+++
webservices/sandesha/trunk/src/org/apache/sandesha2/util/SequenceManager.java
Sun Feb 12 23:56:26 2006
@@ -116,6 +116,7 @@
NextMsgBeanMgr nextMsgMgr = storageManager.getNextMsgBeanMgr();
nextMsgMgr.insert(new NextMsgBean(sequenceId, 1)); // 1 will be
the next
+
// message to invoke. This will apply for only in-order
invocations.
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/workers/InOrderInvoker.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/workers/InOrderInvoker.java?rev=377319&r1=377318&r2=377319&view=diff
==============================================================================
---
webservices/sandesha/trunk/src/org/apache/sandesha2/workers/InOrderInvoker.java
(original)
+++
webservices/sandesha/trunk/src/org/apache/sandesha2/workers/InOrderInvoker.java
Sun Feb 12 23:56:26 2006
@@ -122,7 +122,7 @@
if (allSequencesBean == null)
continue;
- ArrayList allSequencesList =
SandeshaUtil.getArrayListFromString( allSequencesBean
+ ArrayList allSequencesList =
SandeshaUtil.getArrayListFromString (allSequencesBean
.getValue());
preInvocationTransaction.commit();
@@ -192,8 +192,9 @@
Transaction
deleteEntryTransaction = storageManager.getTransaction();
//deleting the message
entry.
storageMapMgr.delete(key);
+
deleteEntryTransaction.commit();
-
+
} catch (AxisFault e) {
throw new
SandeshaException(e);
}
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Sequence.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Sequence.java?rev=377319&r1=377318&r2=377319&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Sequence.java
(original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Sequence.java Sun
Feb 12 23:56:26 2006
@@ -46,6 +46,8 @@
private SOAPFactory factory;
OMNamespace seqNoNamespace = null;
+
+ private boolean mustUnderstand = true;
public Sequence(SOAPFactory factory) {
this.factory = factory;
@@ -121,7 +123,7 @@
//soapHeader.addChild(elem1)
- sequenceHeaderBlock.setMustUnderstand(true);
+ sequenceHeaderBlock.setMustUnderstand(isMustUnderstand());
identifier.toOMElement(sequenceHeaderBlock);
messageNumber.toOMElement(sequenceHeaderBlock);
if (lastMessage != null)
@@ -171,5 +173,15 @@
toOMElement(header);
}
+
+ public boolean isMustUnderstand() {
+ return mustUnderstand;
+ }
+
+ public void setMustUnderstand(boolean mustUnderstand) {
+ this.mustUnderstand = mustUnderstand;
+ }
+
+
}
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java?rev=377319&r1=377318&r2=377319&view=diff
==============================================================================
---
webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java
(original)
+++
webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java
Sun Feb 12 23:56:26 2006
@@ -28,6 +28,7 @@
import org.apache.ws.commons.soap.SOAPEnvelope;
import org.apache.ws.commons.soap.SOAPFactory;
import org.apache.ws.commons.soap.SOAPHeader;
+import org.apache.ws.commons.soap.SOAPHeaderBlock;
import org.apache.sandesha2.Sandesha2Constants;
/**
@@ -52,6 +53,8 @@
SOAPFactory factory;
+ private boolean mustUnderstand = true;
+
public SequenceAcknowledgement(SOAPFactory factory) {
this.factory = factory;
rmNamespace = factory.createOMNamespace(
@@ -117,7 +120,10 @@
SOAPHeader SOAPHeader = (SOAPHeader) header;
- if (sequenceAcknowledgementElement == null)
+ SOAPHeaderBlock sequenceAcknowledgementHeaderBlock =
SOAPHeader.addHeaderBlock(
+
Sandesha2Constants.WSRM.SEQUENCE_ACK,rmNamespace);
+
+ if (sequenceAcknowledgementHeaderBlock == null)
throw new OMException(
"Cant set sequence acknowledgement
since the element is null");
@@ -125,22 +131,23 @@
throw new OMException(
"Cant set the sequence since Identifier
is null");
- identifier.toOMElement(sequenceAcknowledgementElement);
+
sequenceAcknowledgementHeaderBlock.setMustUnderstand(isMustUnderstand());
+ identifier.toOMElement(sequenceAcknowledgementHeaderBlock);
Iterator ackRangeIt = acknowledgementRangeList.iterator();
while (ackRangeIt.hasNext()) {
AcknowledgementRange ackRange = (AcknowledgementRange)
ackRangeIt
.next();
- ackRange.toOMElement(sequenceAcknowledgementElement);
+
ackRange.toOMElement(sequenceAcknowledgementHeaderBlock);
}
Iterator nackIt = nackList.iterator();
while (nackIt.hasNext()) {
Nack nack = (Nack) nackIt.next();
- nack.toOMElement(sequenceAcknowledgementElement);
+ nack.toOMElement(sequenceAcknowledgementHeaderBlock);
}
- SOAPHeader.addChild(sequenceAcknowledgementElement);
+ SOAPHeader.addChild(sequenceAcknowledgementHeaderBlock);
sequenceAcknowledgementElement = factory.createOMElement(
Sandesha2Constants.WSRM.SEQUENCE_ACK,
rmNamespace);
@@ -195,4 +202,13 @@
toOMElement(header);
}
+ public boolean isMustUnderstand() {
+ return mustUnderstand;
+ }
+
+ public void setMustUnderstand(boolean mustUnderstand) {
+ this.mustUnderstand = mustUnderstand;
+ }
+
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
