[java-identity-provider] branch master updated: Remove duplicate injection of custom object.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=95efec6621fc10abd028eef691ed128b707abef1

The following commit(s) were added to refs/heads/master by this push:
       new  95efec6   Remove duplicate injection of custom object.
95efec6 is described below

commit 95efec6621fc10abd028eef691ed128b707abef1
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu May 4 21:37:56 2017 -0400

    Remove duplicate injection of custom object.
---
 .../shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcher.java   | 1 -
 .../idp/attribute/filter/policyrule/impl/ScriptedPolicyRule.java        | 1 -
 .../idp/attribute/resolver/ad/impl/ScriptedAttributeDefinition.java     | 1 -
 .../idp/attribute/resolver/dc/impl/ScriptedDataConnector.java           | 2 --
 4 files changed, 5 deletions(-)

diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcher.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcher.java
index 001eb13..617da5f 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcher.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcher.java
@@ -276,7 +276,6 @@ public class ScriptedMatcher extends AbstractIdentifiableInitializableComponent
 
             scriptContext.setAttribute("attribute", input[0], ScriptContext.ENGINE_SCOPE);
             scriptContext.setAttribute("filterContext", input[1], ScriptContext.ENGINE_SCOPE);
-            scriptContext.setAttribute("custom", getCustomObject(), ScriptContext.ENGINE_SCOPE);
             
             final ProfileRequestContext prc = prcLookupStrategy.apply((AttributeFilterContext) input[1]);
             scriptContext.setAttribute("profileContext", prc, ScriptContext.ENGINE_SCOPE);
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/impl/ScriptedPolicyRule.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/impl/ScriptedPolicyRule.java
index b52574f..fc6d7c6 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/impl/ScriptedPolicyRule.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/impl/ScriptedPolicyRule.java
@@ -271,7 +271,6 @@ public class ScriptedPolicyRule extends AbstractIdentifiableInitializableCompone
         protected void prepareContext(@Nonnull final ScriptContext scriptContext, @Nullable final Object... input) {
 
             scriptContext.setAttribute("filterContext", input[0], ScriptContext.ENGINE_SCOPE);
-            scriptContext.setAttribute("custom", getCustomObject(), ScriptContext.ENGINE_SCOPE);
             
             final ProfileRequestContext prc = prcLookupStrategy.apply((AttributeFilterContext) input[0]);
             scriptContext.setAttribute("profileContext", prc, ScriptContext.ENGINE_SCOPE);
diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeDefinition.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeDefinition.java
index 63b2204..1ec0749 100644
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeDefinition.java
+++ b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeDefinition.java
@@ -251,7 +251,6 @@ public class ScriptedAttributeDefinition extends AbstractAttributeDefinition {
             scriptContext.setAttribute("workContext",
                     new DelegatedWorkContext((AttributeResolverWorkContext) input[1], getLogPrefix()),
                     ScriptContext.ENGINE_SCOPE);
-            scriptContext.setAttribute("custom", getCustomObject(), ScriptContext.ENGINE_SCOPE);
             
             final ProfileRequestContext prc = prcLookupStrategy.apply((AttributeResolutionContext) input[0]);
             if (null == prc) {
diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnector.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnector.java
index cc02664..8a20a44 100644
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnector.java
+++ b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnector.java
@@ -231,8 +231,6 @@ public class ScriptedDataConnector extends AbstractDataConnector {
                     new DelegatedWorkContext((AttributeResolverWorkContext) input[1], getLogPrefix()),
                     ScriptContext.ENGINE_SCOPE);
             
-            scriptContext.setAttribute("custom", getCustomObject(), ScriptContext.ENGINE_SCOPE);
-
             final ProfileRequestContext prc = prcLookupStrategy.apply((AttributeResolutionContext) input[0]);
             if (null == prc) {
                 log.error("{} ProfileRequestContext could not be located", getLogPrefix());

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.