OODT-887 change url to uri to prevent dns resolution
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/1b8d1f70 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/1b8d1f70 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/1b8d1f70 Branch: refs/heads/master Commit: 1b8d1f701782ee16f76303f9aa6a8fffeee76ff1 Parents: 77cfebf Author: Tom Barber <[email protected]> Authored: Fri Oct 9 20:24:35 2015 +0100 Committer: Tom Barber <[email protected]> Committed: Fri Oct 9 20:24:35 2015 +0100 ---------------------------------------------------------------------- .../cas/pushpull/protocol/ProtocolHandler.java | 34 ++++++++++---------- .../oodt/cas/pushpull/protocol/RemoteSite.java | 4 ++- 2 files changed, 20 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/1b8d1f70/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolHandler.java ---------------------------------------------------------------------- diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolHandler.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolHandler.java index b1fcb83..da104b3 100644 --- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolHandler.java +++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolHandler.java @@ -21,28 +21,24 @@ package org.apache.oodt.cas.pushpull.protocol; import org.apache.oodt.cas.protocol.Protocol; import org.apache.oodt.cas.protocol.ProtocolFactory; import org.apache.oodt.cas.protocol.ProtocolFile; -import org.apache.oodt.cas.pushpull.protocol.RemoteSiteFile; -import org.apache.oodt.cas.pushpull.config.ProtocolInfo; import org.apache.oodt.cas.protocol.auth.BasicAuthentication; import org.apache.oodt.cas.protocol.exceptions.ProtocolException; import org.apache.oodt.cas.protocol.util.ProtocolFileFilter; +import org.apache.oodt.cas.pushpull.config.ProtocolInfo; import org.apache.oodt.cas.pushpull.exceptions.RemoteConnectionException; - //JDK imports import java.io.File; import java.io.IOException; import java.net.MalformedURLException; -import java.net.URL; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.*; import java.util.Map.Entry; -import java.util.Vector; import java.util.logging.Level; import java.util.logging.Logger; + /** * This class is responsible for creating the appropriate Protocol for the given * RemoteSites. The boolean argument 'allowReuse' allows for one unique protocol @@ -59,9 +55,9 @@ import java.util.logging.Logger; */ public class ProtocolHandler { - private final HashMap<URL, ProtocolFactory> urlAndProtocolFactory; + private final HashMap<URI, ProtocolFactory> urlAndProtocolFactory; - private final HashMap<URL, Protocol> reuseProtocols; + private final HashMap<URI, Protocol> reuseProtocols; private final HashMap<RemoteSiteFile, PagingInfo> pageInfos; @@ -81,8 +77,8 @@ public class ProtocolHandler { */ public ProtocolHandler(ProtocolInfo pi) { this.pi = pi; - urlAndProtocolFactory = new HashMap<URL, ProtocolFactory>(); - reuseProtocols = new HashMap<URL, Protocol>(); + urlAndProtocolFactory = new HashMap<URI, ProtocolFactory>(); + reuseProtocols = new HashMap<URI, Protocol>(); pageInfos = new HashMap<RemoteSiteFile, PagingInfo>(); pathAndFileListMap = new HashMap<RemoteSiteFile, List<RemoteSiteFile>>(); } @@ -154,7 +150,7 @@ public class ProtocolHandler { + remoteSite.getURL()); protocol = null; } else { - this.urlAndProtocolFactory.put(remoteSite.getURL(), + this.urlAndProtocolFactory.put(remoteSite.getURL().toURI(), protocolFactory); break; } @@ -171,7 +167,11 @@ public class ProtocolHandler { connect(protocol = protocolFactory.newInstance(), remoteSite, false); } if (allowReuse) - this.reuseProtocols.put(remoteSite.getURL(), protocol); + try { + this.reuseProtocols.put(remoteSite.getURL().toURI(), protocol); + } catch (URISyntaxException e) { + LOG.log(Level.SEVERE, "Couildn't covert URL to URI Mesage: " + e.getMessage()); + } } return protocol; } @@ -515,8 +515,8 @@ public class ProtocolHandler { * @throws RemoteConnectionException */ public void close() throws RemoteConnectionException { - Set<Entry<URL, Protocol>> entries = reuseProtocols.entrySet(); - for (Entry<URL, Protocol> entry : entries) { + Set<Entry<URI, Protocol>> entries = reuseProtocols.entrySet(); + for (Entry<URI, Protocol> entry : entries) { disconnect(entry.getValue()); } this.reuseProtocols.clear(); http://git-wip-us.apache.org/repos/asf/oodt/blob/1b8d1f70/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/RemoteSite.java ---------------------------------------------------------------------- diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/RemoteSite.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/RemoteSite.java index 4275228..76e2779 100644 --- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/RemoteSite.java +++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/RemoteSite.java @@ -104,8 +104,10 @@ public class RemoteSite { } catch (URISyntaxException e) { LOG.log(Level.SEVERE, "Could not convert URL to URL: Message: "+e.getMessage()); } - } else + } else { return false; + } + return false; } public String toString() {
