From 60869cf716f441844b7da237833269126c5c1e7d Mon Sep 17 00:00:00 2001
From: Jj! <jj@unicon.net>
Date: Tue, 25 Sep 2018 16:46:38 -0500
Subject: [PATCH] [SHIBUI-899] move some code about

---
 .../OpenSamlFileBackedHTTPMetadataResolver.java   | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlFileBackedHTTPMetadataResolver.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlFileBackedHTTPMetadataResolver.java
index d6204aee3..d7d124a0a 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlFileBackedHTTPMetadataResolver.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlFileBackedHTTPMetadataResolver.java
@@ -8,7 +8,6 @@
 import org.apache.http.impl.client.HttpClients;
 import org.apache.lucene.index.IndexWriter;
 import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
 import org.joda.time.chrono.ISOChronology;
 import org.opensaml.saml.metadata.resolver.filter.FilterException;
 import org.opensaml.saml.metadata.resolver.filter.MetadataFilterChain;
@@ -99,17 +98,15 @@ public void refilter() {
     // why the negative refresh is occurring.
     @Override
     public synchronized void refresh() throws ResolverException {
-        DateTime now = null;
-        String mdId = null;
+        // In case a destroy() thread beat this thread into the monitor.
+        if (isDestroyed()) {
+            return;
+        }
 
         try {
-            // In case a destroy() thread beat this thread into the monitor.
-            if (isDestroyed()) {
-                return;
-            }
 
-            now = new DateTime(ISOChronology.getInstanceUTC());
-            mdId = getMetadataIdentifier();
+            DateTime now = new DateTime(ISOChronology.getInstanceUTC());
+            String mdId = getMetadataIdentifier();
 
             final byte[] mdBytes = fetchMetadata();
             if (mdBytes == null) {