You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2015/10/10 08:54:33 UTC
[02/10] oodt git commit: OODT-887 remove URL network dependency
OODT-887 remove URL network dependency
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/e03610df
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/e03610df
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/e03610df
Branch: refs/heads/master
Commit: e03610dfe6ede85a40148ecfe821ac3864c8954b
Parents: 95e04f9
Author: Tom Barber <to...@analytical-labs.com>
Authored: Fri Oct 9 17:00:19 2015 +0100
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Fri Oct 9 17:00:19 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../org/apache/oodt/cas/filemgr/ingest/StdIngester.java | 9 +++++++--
2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/e03610df/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 968467f..3322d8b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,8 @@ Release 0.11 - Current Development
* OODT-882 Merge dependency update into master (magicaltrout)
+* OODT-887 Prevent DNS resolution on URL Lookup
+
Release 0.10 - 08/30/2015
* OODT-871 Issues with OODT 0.10 RC#1 (lewismc, mattmann)
http://git-wip-us.apache.org/repos/asf/oodt/blob/e03610df/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java
index 132321e..adc9b69 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java
@@ -34,6 +34,7 @@ import org.apache.oodt.cas.metadata.exceptions.MetExtractionException;
//JDK imports
import java.io.File;
+import java.net.URISyntaxException;
import java.net.URL;
import java.util.Iterator;
import java.util.List;
@@ -243,8 +244,12 @@ public class StdIngester implements Ingester, CoreMetKeys {
private void checkOrSetFileManager(URL url) {
if (this.fmClient != null && this.fmClient.getFileManagerUrl() != null) {
- if (!this.fmClient.getFileManagerUrl().equals(url)) {
- setFileManager(url);
+ try {
+ if (!this.fmClient.getFileManagerUrl().toURI().equals(url.toURI())) {
+ setFileManager(url);
+ }
+ } catch (URISyntaxException e) {
+ LOG.log(Level.SEVERE, "Could not convert URL to URI, Message :" +e.getMessage());
}
} else {
setFileManager(url);