You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2012/08/31 22:20:58 UTC
svn commit: r1379583 - in /axis/axis2/java/sandesha/branches/1_6: ./
modules/core/src/main/java/org/apache/sandesha2/wsrm/
Author: veithen
Date: Fri Aug 31 20:20:58 2012
New Revision: 1379583
URL: http://svn.apache.org/viewvc?rev=1379583&view=rev
Log:
Merged r1338864 to the 1.6 branch to ensure that Sandesha2 1.6.x can be built with Axiom 1.2.14-SNAPSHOT.
Modified:
axis/axis2/java/sandesha/branches/1_6/ (props changed)
axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/wsrm/AcksTo.java
axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/wsrm/Endpoint.java
axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java
Propchange: axis/axis2/java/sandesha/branches/1_6/
------------------------------------------------------------------------------
Merged /axis/axis2/java/sandesha/trunk:r1338864
Modified: axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/wsrm/AcksTo.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/wsrm/AcksTo.java?rev=1379583&r1=1379582&r2=1379583&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/wsrm/AcksTo.java (original)
+++ axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/wsrm/AcksTo.java Fri Aug 31 20:20:58 2012
@@ -102,7 +102,9 @@ public class AcksTo implements IOMRMElem
SandeshaMessageKeys.cannotSetAcksTo,
null));
- OMFactory factory = element.getOMFactory();
+ // Ensure that we use the plain OMFactory (and not SOAPFactory). This forces
+ // EndpointReferenceHelper.toOM to create an OMElement instead of a SOAPHeaderBlock.
+ OMFactory factory = element.getOMFactory().getMetaFactory().getOMFactory();
QName acksTo = new QName (rmNamespaceValue,Sandesha2Constants.WSRM_COMMON.ACKS_TO, Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
OMElement endpointElement = EndpointReferenceHelper.toOM (factory,epr, acksTo ,addressingNamespaceValue);
Modified: axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/wsrm/Endpoint.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/wsrm/Endpoint.java?rev=1379583&r1=1379582&r2=1379583&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/wsrm/Endpoint.java (original)
+++ axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/wsrm/Endpoint.java Fri Aug 31 20:20:58 2012
@@ -93,7 +93,9 @@ public class Endpoint implements IOMRMEl
SandeshaMessageKeys.cannotSetEndpoint,
null));
- OMFactory factory = element.getOMFactory();
+ // Ensure that we use the plain OMFactory (and not SOAPFactory). This forces
+ // EndpointReferenceHelper.toOM to create an OMElement instead of a SOAPHeaderBlock.
+ OMFactory factory = element.getOMFactory().getMetaFactory().getOMFactory();
QName endpoint = new QName (rmNamespaceValue,Sandesha2Constants.WSRM_COMMON.ENDPOINT, Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
OMElement endpointElement = EndpointReferenceHelper.toOM (factory, epr, endpoint, addressingNamespaceValue);
Modified: axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java?rev=1379583&r1=1379582&r2=1379583&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java (original)
+++ axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java Fri Aug 31 20:20:58 2012
@@ -74,7 +74,7 @@ public class SequenceAcknowledgement imp
}
public Object fromHeaderBlock(SOAPHeaderBlock sequenceAckElement) throws OMException,SandeshaException {
- originalSequenceAckElement = sequenceAckElement;
+ originalSequenceAckElement = sequenceAckElement.cloneOMElement();
OMElement identifierPart = null;
Iterator childElements = sequenceAckElement.getChildElements();
while(childElements.hasNext()){