[java-identity-provider COMMIT] in /trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/re...

[noreply at shibboleth.net]

Author: rdw
Date: Wed Feb  4 11:36:32 2015
New Revision: 7313

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7313&view=rev
Log:
IDP-589 Fix bogus caching of the attribute or dataconnector id in the log prefix

Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/BaseAttributeDefinitionParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/AbstractDataConnectorParser.java

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/BaseAttributeDefinitionParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/BaseAttributeDefinitionParser.java?rev=7313&r1=7312&r2=7313&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/BaseAttributeDefinitionParser.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/BaseAttributeDefinitionParser.java Wed Feb  4 11:36:32 2015
@@ -56,9 +56,6 @@
 
     /** Class logger. */
     private final Logger log = LoggerFactory.getLogger(BaseAttributeDefinitionParser.class);
-
-    /** cache for the log prefix - to save multiple recalculations. */
-    private String logPrefix;
 
     /** {@inheritDoc} */
     @Override protected void doParse(@Nonnull final Element config, @Nonnull final ParserContext parserContext,
@@ -132,10 +129,7 @@
      * @return "Attribute Definition '<definitionID>' :"
      */
     @Nonnull @NotEmpty protected String getLogPrefix() {
-        if (null == logPrefix) {
-            StringBuilder builder = new StringBuilder("Attribute Definition '").append(getDefinitionId()).append("':");
-            logPrefix = builder.toString();
-        }
-        return logPrefix;
+        StringBuilder builder = new StringBuilder("Attribute Definition '").append(getDefinitionId()).append("':");
+        return builder.toString();
     }
 }

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/AbstractDataConnectorParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/AbstractDataConnectorParser.java?rev=7313&r1=7312&r2=7313&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/AbstractDataConnectorParser.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/AbstractDataConnectorParser.java Wed Feb  4 11:36:32 2015
@@ -60,9 +60,6 @@
     /** Failover data connector attribute name. */
     public static final QName FAILOVER_DATA_CONNECTOR_ELEMENT_NAME = new QName(
             AttributeResolverNamespaceHandler.NAMESPACE, "FailoverDataConnector");
-
-    /** cache for the log prefix - to save multiple recalculations. */
-    private String logPrefix;
 
     /** Log4j logger. */
     private final Logger log = LoggerFactory.getLogger(AbstractDataConnectorParser.class);
@@ -145,10 +142,7 @@
      * @return "Attribute Definition: '<definitionID>' :"
      */
     @Nonnull @NotEmpty protected String getLogPrefix() {
-        if (null == logPrefix) {
-            StringBuilder builder = new StringBuilder("Data Connector '").append(getDefinitionId()).append("':");
-            logPrefix = builder.toString();
-        }
-        return logPrefix;
+        StringBuilder builder = new StringBuilder("Data Connector '").append(getDefinitionId()).append("':");
+        return builder.toString();
     }
 }