Author: rr
Date: Sat May 8 05:01:33 2010
New Revision: 942309
URL: http://svn.apache.org/viewvc?rev=942309&view=rev
Log:
ODE-774: npe when something is mapped to message header part of variable
(Thanks to Anurag Aggarwal)
Modified:
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java
Modified:
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java?rev=942309&r1=942308&r2=942309&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java
(original)
+++
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java
Sat May 8 05:01:33 2010
@@ -432,7 +432,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,