svn commit: r1333034 - /ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallScript.java

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1333034 - /ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallScript.java

adrianc
Author: adrianc
Date: Wed May  2 13:22:50 2012
New Revision: 1333034

URL: http://svn.apache.org/viewvc?rev=1333034&view=rev
Log:
Oops, forgot to include null check in previous commit.

Modified:
    ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallScript.java

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallScript.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallScript.java?rev=1333034&r1=1333033&r2=1333034&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallScript.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallScript.java Wed May  2 13:22:50 2012
@@ -74,7 +74,7 @@ public final class CallScript extends Me
         if (inlineScript.length() == 0) {
             inlineScript = UtilXml.elementValue(element);
         }
-        if (MiniLangUtil.containsScript(inlineScript)) {
+        if (inlineScript != null && MiniLangUtil.containsScript(inlineScript)) {
             this.scriptlet = new Scriptlet(StringUtil.convertOperatorSubstitutions(inlineScript));
             this.location = null;
             this.method = null;