You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by mr...@apache.org on 2006/10/03 23:40:03 UTC

svn commit: r452638 - /incubator/ode/trunk/bpel-el-xpath20/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntime.java

Author: mriou
Date: Tue Oct  3 14:40:02 2006
New Revision: 452638

URL: http://svn.apache.org/viewvc?view=rev&rev=452638
Log:
Fixing a potential NPE.

Modified:
    incubator/ode/trunk/bpel-el-xpath20/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntime.java

Modified: incubator/ode/trunk/bpel-el-xpath20/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntime.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-el-xpath20/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntime.java?view=diff&rev=452638&r1=452637&r2=452638
==============================================================================
--- incubator/ode/trunk/bpel-el-xpath20/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntime.java (original)
+++ incubator/ode/trunk/bpel-el-xpath20/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntime.java Tue Oct  3 14:40:02 2006
@@ -175,8 +175,11 @@
             // Extracting the real cause from all this wrapping isn't a simple task
             Throwable cause = e.getCause() != null ? e.getCause() : e;
             if (cause instanceof DynamicError) {
-                cause = ((DynamicError)cause).getException();
-                if (cause.getCause() != null) cause = cause.getCause();
+                Throwable th = ((DynamicError)cause).getException();
+                if (th != null) {
+                    cause = th;
+                    if (cause.getCause() != null) cause = cause.getCause();
+                }
             }
             throw new EvaluationException("Error while executing an XPath expression: " + cause.toString(), cause);
         } catch (WrappedResolverException wre) {