Repository: tika Updated Branches: refs/heads/master bb46c0e0c -> fc4f13dde
TIKA-1978 Invocation of java.net.URL.equals(Object), which blocks to do domain name resolution, in org.apache.tika.parser.geo.topic.GeoParser.initialize(URL) Project: http://git-wip-us.apache.org/repos/asf/tika/repo Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/fc4f13dd Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/fc4f13dd Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/fc4f13dd Branch: refs/heads/master Commit: fc4f13ddebf2b9519d75a3079adb307313e79259 Parents: bb46c0e Author: Lewis John McGibbney <[email protected]> Authored: Tue May 24 15:24:23 2016 -0700 Committer: Lewis John McGibbney <[email protected]> Committed: Tue May 24 15:24:23 2016 -0700 ---------------------------------------------------------------------- .../org/apache/tika/parser/geo/topic/GeoParser.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tika/blob/fc4f13dd/tika-parsers/src/main/java/org/apache/tika/parser/geo/topic/GeoParser.java ---------------------------------------------------------------------- diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/geo/topic/GeoParser.java b/tika-parsers/src/main/java/org/apache/tika/parser/geo/topic/GeoParser.java index e1b5137..b4ec6da 100644 --- a/tika-parsers/src/main/java/org/apache/tika/parser/geo/topic/GeoParser.java +++ b/tika-parsers/src/main/java/org/apache/tika/parser/geo/topic/GeoParser.java @@ -19,6 +19,7 @@ package org.apache.tika.parser.geo.topic; import java.io.IOException; import java.io.InputStream; +import java.net.URISyntaxException; import java.net.URL; import java.util.ArrayList; import java.util.Collections; @@ -66,9 +67,12 @@ public class GeoParser extends AbstractParser { * @param modelUrl the URL to NER model */ public void initialize(URL modelUrl) { - if (this.modelUrl != null && this.modelUrl.equals(modelUrl)) { - // Previously initialized for the same URL, no initialization needed - return; + try { + if (this.modelUrl != null && this.modelUrl.toURI().equals(modelUrl.toURI())) { + return; + } + } catch (URISyntaxException e1) { + throw new RuntimeException(e1.getMessage()); } this.modelUrl = modelUrl; @@ -79,8 +83,8 @@ public class GeoParser extends AbstractParser { this.available = modelUrl != null && gazetteerClient.checkAvail(); if (this.available) { - try { - TokenNameFinderModel model = new TokenNameFinderModel(modelUrl); + try { + TokenNameFinderModel model = new TokenNameFinderModel(modelUrl); this.nameFinder = new NameFinderME(model); } catch (Exception e) { LOG.warning("Named Entity Extractor setup failed: " + e);
