MARMOTTA-499: remove usage of java nio, since the tika fallback was always used anyway
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/e447515d Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/e447515d Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/e447515d Branch: refs/heads/MARMOTTA-499 Commit: e447515dce46926dbbeb7268749c414907edeccd Parents: 99cca9d Author: Sergio Fernández <[email protected]> Authored: Wed Jul 9 08:31:45 2014 +0200 Committer: Sergio Fernández <[email protected]> Committed: Wed Jul 9 08:31:45 2014 +0200 ---------------------------------------------------------------------- .../services/modules/MarmottaResourceServiceImpl.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/e447515d/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/modules/MarmottaResourceServiceImpl.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/modules/MarmottaResourceServiceImpl.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/modules/MarmottaResourceServiceImpl.java index f735e39..422fad1 100644 --- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/modules/MarmottaResourceServiceImpl.java +++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/modules/MarmottaResourceServiceImpl.java @@ -34,8 +34,6 @@ import javax.enterprise.event.Observes; import javax.inject.Inject; import java.io.IOException; import java.net.URL; -import java.nio.file.Files; -import java.nio.file.Paths; import java.util.HashMap; import java.util.Map; import java.util.concurrent.ConcurrentMap; @@ -122,7 +120,7 @@ public class MarmottaResourceServiceImpl implements MarmottaResourceService { if(jarUrl != null) { try { byte[] bytes = ByteStreams.toByteArray(jarUrl.openStream()); - data = new ResourceEntry(jarUrl, bytes, bytes.length, getMimeType(jarUrl)); + data = new ResourceEntry(jarUrl, bytes, bytes.length, getMimeType(relativeURL)); log.debug("retrieved resource {} (mime type {}, length {} bytes)", jarUrl.toString(), data.getContentType(), data.getLength()); } catch (NullPointerException e) { // This happens if a directory is accessed in the jar-file. @@ -213,12 +211,8 @@ public class MarmottaResourceServiceImpl implements MarmottaResourceService { } private String getMimeType(String resource) { - try { - return Files.probeContentType(Paths.get(resource)); - } catch (IOException e) { - log.error("No mimetype detected for resource {} by Java NIO, so switching to Tika: {}", resource, e.getMessage()); - return tika.detect(resource); - } + log.warn("{}: {}", resource, tika.detect(resource)); + return tika.detect(resource); } }
