Repository: oodt Updated Branches: refs/heads/master 3e41007ec -> 06b5dec1c
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/95e04f9a Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/95e04f9a Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/95e04f9a Branch: refs/heads/master Commit: 95e04f9a223d076beee3d4d5604b5296cbb2e315 Parents: afb8fdc Author: Tom Barber <[email protected]> Authored: Fri Oct 9 16:57:50 2015 +0100 Committer: Tom Barber <[email protected]> Committed: Fri Oct 9 16:57:50 2015 +0100 ---------------------------------------------------------------------- .../org/apache/oodt/cas/filemgr/ingest/CachedIngester.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/95e04f9a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CachedIngester.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CachedIngester.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CachedIngester.java index 4c48b1c..f82ef5e 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CachedIngester.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CachedIngester.java @@ -20,6 +20,7 @@ package org.apache.oodt.cas.filemgr.ingest; //JDK imports import java.io.File; import java.io.FileInputStream; +import java.net.URISyntaxException; import java.net.URL; import java.util.logging.Level; import java.util.logging.Logger; @@ -112,7 +113,8 @@ public class CachedIngester extends StdIngester { */ public boolean hasProduct(URL fmUrl, String productName) throws CatalogException { - if (cache.getFileManagerUrl().equals(fmUrl)) { + try { + if (cache.getFileManagerUrl().toURI().equals(fmUrl.toURI())) { return cache.contains(productName); } else { // need to re-sync @@ -129,6 +131,10 @@ public class CachedIngester extends StdIngester { } return cache.contains(productName); } + } catch (URISyntaxException e) { + LOG.log(Level.SEVERE, "Exception getting URI from URL"); + throw new CatalogException("Exception getting URL from URL: Message: " + e.getMessage()); + } } /**
