Author: gatfora
Date: Tue Mar 20 04:04:21 2007
New Revision: 520353
URL: http://svn.apache.org/viewvc?view=rev&rev=520353
Log:
For AckRequested, SequenceFault and MessagePending headers, set them as
processed when fromOMElement is called
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckRequested.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MessagePending.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceFault.java
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckRequested.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckRequested.java?view=diff&rev=520353&r1=520352&r2=520353
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckRequested.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckRequested.java
Tue Mar 20 04:04:21 2007
@@ -64,7 +64,10 @@
identifier = new Identifier(namespaceValue);
identifier.fromOMElement(ackReqElement);
-
+
+ // Indicate that we have processed this SOAPHeaderBlock
+ ((SOAPHeaderBlock)ackReqElement).setProcessed();
+
return this;
}
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MessagePending.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MessagePending.java?view=diff&rev=520353&r1=520352&r2=520353
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MessagePending.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MessagePending.java
Tue Mar 20 04:04:21 2007
@@ -87,6 +87,9 @@
throw new SandeshaException (message);
}
+ // Mark this element as processed
+ ((SOAPHeaderBlock)messagePendingElement).setProcessed();
+
return messagePendingElement;
}
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceFault.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceFault.java?view=diff&rev=520353&r1=520352&r2=520353
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceFault.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceFault.java
Tue Mar 20 04:04:21 2007
@@ -25,6 +25,7 @@
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPHeader;
+import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.i18n.SandeshaMessageHelper;
@@ -69,16 +70,18 @@
faultCode.fromOMElement(sequenceFaultPart);
}
+ ((SOAPHeaderBlock)sequenceFaultPart).setProcessed();
+
return this;
}
- public OMElement toOMElement(OMElement body) throws OMException {
+ public OMElement toOMElement(OMElement header) throws OMException {
- if (body == null || !(body instanceof SOAPHeader))
+ if (header == null || !(header instanceof SOAPHeader))
throw new OMException(SandeshaMessageHelper.getMessage(
SandeshaMessageKeys.seqFaultCannotBeExtractedToNonHeader));
- OMFactory factory = body.getOMFactory();
+ OMFactory factory = header.getOMFactory();
OMNamespace rmNamespace =
factory.createOMNamespace(namespaceValue,Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
OMElement sequenceFaultElement =factory.createOMElement(
@@ -86,9 +89,9 @@
if (faultCode != null)
faultCode.toOMElement(sequenceFaultElement);
- body.addChild(sequenceFaultElement);
+ header.addChild(sequenceFaultElement);
- return body;
+ return header;
}
public void setFaultCode(FaultCode faultCode) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
