[java-identity-provider COMMIT] /trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Apr 29 10:01:17 2013
New Revision: 4430

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4430&view=rev
Log:
IDP-283 Remove Optional from Scripted support functions and its only use in the attribute filter)

Modified:
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/ScriptedMatcher.java

Modified: trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/ScriptedMatcher.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/ScriptedMatcher.java?rev=4430&r1=4429&r2=4430&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/ScriptedMatcher.java (original)
+++ trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/ScriptedMatcher.java Mon Apr 29 10:01:17 2013
@@ -109,13 +109,12 @@
         scriptContext.setAttribute("filterContext", filterContext, ScriptContext.ENGINE_SCOPE);
 
         try {
-            final Optional<Object> optionalResult = currentScript.eval(scriptContext);
-            if (!optionalResult.isPresent()) {
+            final Object result = currentScript.eval(scriptContext);
+            if (null == result) {
                 //TODO
                 throw new IllegalArgumentException("Matcher script did not return a result");
             }
 
-            final Object result = optionalResult.get();
             if (result instanceof Boolean) {
                 return ((Boolean) result).booleanValue();
             } else {
@@ -155,12 +154,11 @@
         scriptContext.setAttribute("attribute", attribute, ScriptContext.ENGINE_SCOPE);
 
         try {
-            final Optional<Object> optionalResult = currentScript.eval(scriptContext);
-            if (!optionalResult.isPresent()) {
+            final Object result = currentScript.eval(scriptContext);
+            if (null == result) {
                 throw new AttributeFilteringException("Matcher script did not return a result");
             }
 
-            final Object result = optionalResult.get();
             if (result instanceof Set) {
                 HashSet<AttributeValue> returnValues = new HashSet<AttributeValue>(attribute.getValues());
                 returnValues.retainAll((Set) result);