[java-shib-common COMMIT] in /branches/REL_1: doc/RELEASE-NOTES.txt src/main/java/edu/internet2/middleware/shibboleth...

[noreply at shibboleth.net]

Author: lajoie
Date: Sun Oct  9 15:27:35 2011
New Revision: 1008

URL: http://svn.shibboleth.net/view/java-shib-common?rev=1008&view=rev
Log:
Make sure old metadata providers are destroyed when application context reloads - SC-167

Modified:
    branches/REL_1/doc/RELEASE-NOTES.txt
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/SAMLMDRelyingPartyConfigurationManager.java

Modified: branches/REL_1/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/doc/RELEASE-NOTES.txt?rev=1008&r1=1007&r2=1008&view=diff
==============================================================================
--- branches/REL_1/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_1/doc/RELEASE-NOTES.txt Sun Oct  9 15:27:35 2011
@@ -3,6 +3,7 @@
 [SC-162] - Attribute value added multiple times to retained value set if multiple policies permit the same values
 [SC-163] - NPE when using filtering based on EntityAttributes in metadata
 [SC-165] - Update dependencies
+[SC-167] - Reload of relying-party.xml creates new AbstractReloadingMetadataProvider threads without destroying earlier ones 
 
 Changes in Release 1.3.3
 =============================================

Modified: branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/SAMLMDRelyingPartyConfigurationManager.java
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/SAMLMDRelyingPartyConfigurationManager.java?rev=1008&r1=1007&r2=1008&view=diff
==============================================================================
--- branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/SAMLMDRelyingPartyConfigurationManager.java (original)
+++ branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/SAMLMDRelyingPartyConfigurationManager.java Sun Oct  9 15:27:35 2011
@@ -24,6 +24,7 @@
 
 import org.opensaml.saml2.metadata.EntitiesDescriptor;
 import org.opensaml.saml2.metadata.EntityDescriptor;
+import org.opensaml.saml2.metadata.provider.BaseMetadataProvider;
 import org.opensaml.saml2.metadata.provider.MetadataProvider;
 import org.opensaml.saml2.metadata.provider.MetadataProviderException;
 import org.slf4j.Logger;
@@ -187,7 +188,10 @@
             newRpConfigs.put(ANONYMOUS_RP_NAME, newRpGroup.getAnonymousRP());
             newRpConfigs.put(DEFAULT_RP_NAME, newRpGroup.getDefaultRP());
             rpConfigs = newRpConfigs;
-
+            
+            if(oldProvider instanceof BaseMetadataProvider){
+                ((BaseMetadataProvider)oldProvider).destroy();
+            }
         } catch (Exception e) {
             metadataProvider = oldProvider;
             rpConfigs = oldRpConfigs;