[java-opensaml COMMIT] /trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/ResourceBacke...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Dec 12 18:32:50 2014
New Revision: 4185

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4185&view=rev
Log:
IDP-539 - Remove deprecated c'tor, and add a c'tor without a Timer parameter.

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/ResourceBackedMetadataResolver.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/ResourceBackedMetadataResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/ResourceBackedMetadataResolver.java?rev=4185&r1=4184&r2=4185&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/ResourceBackedMetadataResolver.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/ResourceBackedMetadataResolver.java Fri Dec 12 18:32:50 2014
@@ -40,33 +40,6 @@
     /** Resource from which metadata is read. */
     private Resource metadataResource;
 
-
-    /**
-     * Constructor.
-     * 
-     * @param resource resource from which to read the metadata file.
-     * @param timer task timer used to schedule metadata refresh tasks
-     * @param maxMetadataCacheDuration maximum amount of time, in milliseconds, that metadata may be cached before being
-     *            re-read
-     * 
-     * @throws ResolverException thrown if there is a problem retrieving information about the resource 
-     * 
-     * @deprecated
-     */
-    public ResourceBackedMetadataResolver(Resource resource, Timer timer, long maxMetadataCacheDuration)
-            throws ResolverException {
-        super(timer);
-
-        try {
-            if (!resource.exists()) {
-                throw new IOException("Resource " + resource.getDescription() + " does not exist.");
-            }
-            metadataResource = resource;
-        } catch (IOException e) {
-            throw new ResolverException("Unable to read resource", e);
-        }
-    }
-
     /**
      * Constructor.
      * 
@@ -82,7 +55,22 @@
             throw new IOException("Resource " + resource.getDescription() + " does not exist.");
         }
         metadataResource = resource;
-}
+    }
+    
+    /**
+     * Constructor.
+     * 
+     * @param resource resource from which to read the metadata file.
+     * 
+     * @throws IOException thrown if there is a problem retrieving information about the resource
+     */
+    public ResourceBackedMetadataResolver(Resource resource) throws IOException {
+
+        if (!resource.exists()) {
+            throw new IOException("Resource " + resource.getDescription() + " does not exist.");
+        }
+        metadataResource = resource;
+    }
 
     /** {@inheritDoc} */
     protected void doDestroy() {