[axis-axis2-java-sandesha] 43/48: Merged r1338864 to the 1.6 branch to ensure that Sandesha2 1.6.x can be built with Axiom 1.2.14-SNAPSHOT.

[billblough]

This is an automated email from the ASF dual-hosted git repository.

billblough pushed a commit to branch 1_6
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-sandesha.git

commit 28e47631d85e607310297ae0ed73dfc543164d72
Author: Andreas Veithen <veit...@apache.org>
AuthorDate: Fri Aug 31 20:20:58 2012 +0000

    Merged r1338864 to the 1.6 branch to ensure that Sandesha2 1.6.x can be 
built with Axiom 1.2.14-SNAPSHOT.
---
 modules/core/src/main/java/org/apache/sandesha2/wsrm/AcksTo.java      | 4 +++-
 modules/core/src/main/java/org/apache/sandesha2/wsrm/Endpoint.java    | 4 +++-
 .../main/java/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java  | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/core/src/main/java/org/apache/sandesha2/wsrm/AcksTo.java 
b/modules/core/src/main/java/org/apache/sandesha2/wsrm/AcksTo.java
index d5ab274..bf30742 100644
--- a/modules/core/src/main/java/org/apache/sandesha2/wsrm/AcksTo.java
+++ b/modules/core/src/main/java/org/apache/sandesha2/wsrm/AcksTo.java
@@ -102,7 +102,9 @@ public class AcksTo implements IOMRMElement {
                                        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);
diff --git a/modules/core/src/main/java/org/apache/sandesha2/wsrm/Endpoint.java 
b/modules/core/src/main/java/org/apache/sandesha2/wsrm/Endpoint.java
index 68f5e2f..1c17200 100644
--- a/modules/core/src/main/java/org/apache/sandesha2/wsrm/Endpoint.java
+++ b/modules/core/src/main/java/org/apache/sandesha2/wsrm/Endpoint.java
@@ -93,7 +93,9 @@ public class Endpoint implements IOMRMElement {
                                        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);
diff --git 
a/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java
 
b/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java
index 058dfa3..48287f6 100644
--- 
a/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java
+++ 
b/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java
@@ -74,7 +74,7 @@ public class SequenceAcknowledgement implements RMHeaderPart {
        }
 
        public Object fromHeaderBlock(SOAPHeaderBlock sequenceAckElement) 
throws OMException,SandeshaException {
-               originalSequenceAckElement = sequenceAckElement;
+               originalSequenceAckElement = 
sequenceAckElement.cloneOMElement();
                OMElement identifierPart = null;
                Iterator childElements = sequenceAckElement.getChildElements();
                while(childElements.hasNext()){