[utilities COMMIT] /java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript....

[noreply at shibboleth.net]

Author: scantor
Date: Thu Aug 22 15:43:40 2013
New Revision: 431

URL: http://svn.shibboleth.net/view/utilities?rev=431&view=rev
Log:
Fix annotation/javadoc.

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=431&r1=430&r2=431&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 Thu Aug 22 15:43:40 2013
@@ -22,6 +22,7 @@
 import java.nio.charset.Charset;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import javax.script.Bindings;
 import javax.script.Compilable;
 import javax.script.CompiledScript;
@@ -130,7 +131,7 @@
      * 
      * @throws ScriptException thrown if there was a problem evaluating the script
      */
-    @Nonnull public Object eval(Bindings scriptBindings) throws ScriptException {
+    @Nullable public Object eval(Bindings scriptBindings) throws ScriptException {
         if (compiledScript != null) {
             return compiledScript.eval(scriptBindings);
         } else {
@@ -143,11 +144,11 @@
      * 
      * @param scriptContext the script context
      * 
-     * @return the result of the script or {@link Optional#absent()} if the script did not return a result
+     * @return the result of the script or null if the script did not return a result
      * 
      * @throws ScriptException thrown if there was a problem evaluating the script
      */
-    @Nonnull public Object eval(ScriptContext scriptContext) throws ScriptException {
+    @Nullable public Object eval(ScriptContext scriptContext) throws ScriptException {
         if (compiledScript != null) {
             return compiledScript.eval(scriptContext);
         } else {