svn commit: r942310 - in /ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep: v1/ASSIGN.java v2/ASSIGN.java

[rr]

Author: rr
Date: Sat May  8 05:01:49 2010
New Revision: 942310

URL: http://svn.apache.org/viewvc?rev=942310&view=rev
Log:
ODE-774: npe when something is mapped to message header part of variable 
(Thanks to Anurag Aggarwal)

Modified:
    ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/ASSIGN.java
    ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/ASSIGN.java

Modified: 
ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/ASSIGN.java
URL: 
http://svn.apache.org/viewvc/ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/ASSIGN.java?rev=942310&r1=942309&r2=942310&view=diff
==============================================================================
--- ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/ASSIGN.java 
(original)
+++ ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/ASSIGN.java 
Sat May  8 05:01:49 2010
@@ -394,7 +394,8 @@ class ASSIGN extends ACTIVITY {
                         rvalue = ((Document)rvalue).getDocumentElement();
                 }
 
-                if (headerAssign && 
lvaluePtr.getParentNode().getNodeName().equals("message") && 
rvalue.getNodeType()==Node.ELEMENT_NODE) {
+                 Node parentNode = lvaluePtr.getParentNode();
+                if (headerAssign && parentNode != null && 
"message".equals(parentNode.getNodeName()) && 
rvalue.getNodeType()==Node.ELEMENT_NODE ) {
                     lvalue = copyInto((Element)lvalue, (Element) lvaluePtr, 
(Element) rvalue);
                 } else if (rvalue.getNodeType() == Node.ELEMENT_NODE && 
lvaluePtr.getNodeType() == Node.ELEMENT_NODE) {
                     lvalue = replaceElement((Element)lvalue, (Element) 
lvaluePtr, (Element) rvalue,

Modified: 
ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/ASSIGN.java
URL: 
http://svn.apache.org/viewvc/ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/ASSIGN.java?rev=942310&r1=942309&r2=942310&view=diff
==============================================================================
--- ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/ASSIGN.java 
(original)
+++ ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/ASSIGN.java 
Sat May  8 05:01:49 2010
@@ -217,7 +217,8 @@ class ASSIGN extends ACTIVITY {
                         rvalue = ((Document)rvalue).getDocumentElement();
                 }
 
-                if (headerAssign && 
lvaluePtr.getParentNode().getNodeName().equals("message") && 
rvalue.getNodeType()==Node.ELEMENT_NODE) {
+                 Node parentNode = lvaluePtr.getParentNode();
+                if (headerAssign && parentNode != null && 
"message".equals(parentNode.getNodeName()) && 
rvalue.getNodeType()==Node.ELEMENT_NODE ) {
                     lvalue = copyInto((Element)lvalue, (Element) lvaluePtr, 
(Element) rvalue);
                 } else if (rvalue.getNodeType() == Node.ELEMENT_NODE && 
lvaluePtr.getNodeType() == Node.ELEMENT_NODE) {
                     lvalue = assignHelper.replaceElement((Element)lvalue, 
(Element) lvaluePtr, (Element) rvalue,