[utilities COMMIT] in /java-support/trunk/src: main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScr...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Apr  3 16:18:15 2012
New Revision: 274

URL: http://svn.shibboleth.net/view/utilities?rev=274&view=rev
Log:
Bug fixes for EvaluableScript and unit test to prevent reocurrance

Added:
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/scripting/
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/scripting/EvaluableScriptTest.java   (with props)
Modified:
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java?rev=274&r1=273&r2=274&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java Tue Apr  3 16:18:15 2012
@@ -63,8 +63,8 @@
     public EvaluableScript(@Nonnull @NotEmpty String engineName, @Nonnull @NotEmpty String scriptSource)
             throws ScriptException {
         scriptLanguage =
-                Constraint.isNull(StringSupport.trimOrNull(engineName), "Scripting language can not be null or empty");
-        script = Constraint.isNull(StringSupport.trimOrNull(scriptSource), "Script source can not be null or empty");
+                Constraint.isNotNull(StringSupport.trimOrNull(engineName), "Scripting language can not be null or empty");
+        script = Constraint.isNotNull(StringSupport.trimOrNull(scriptSource), "Script source can not be null or empty");
 
         initialize();
     }
@@ -80,7 +80,7 @@
      */
     public EvaluableScript(@Nonnull @NotEmpty String engineName, @Nonnull File scriptSource) throws ScriptException {
         scriptLanguage =
-                Constraint.isNull(StringSupport.trimOrNull(engineName), "Scripting language can not be null or empty");
+                Constraint.isNotNull(StringSupport.trimOrNull(engineName), "Scripting language can not be null or empty");
 
         Constraint.isNotNull(scriptSource, "Script source file can not be null");
 
@@ -95,8 +95,8 @@
 
         try {
             script =
-                    Constraint.isNull(StringSupport.trimOrNull(Files.toString(scriptSource, Charset.defaultCharset())),
-                            "Scritp source can not be empty");
+                    Constraint.isNotNull(StringSupport.trimOrNull(Files.toString(scriptSource, Charset.defaultCharset())),
+                            "Script source can not be empty");
         } catch (IOException e) {
             throw new ScriptException("Unable to read data from source file " + scriptSource.getAbsolutePath());
         }