浏览代码

Allow openFileURLStream(URL) to open jars

This is related to #23020. There are some cases for where this method
might be called with a URL to a file inside a jar. This commit allows
this method to read URLs with a protocol of 'jar:/'.
Tim Brooks 8 年之前
父节点
当前提交
ee84ce09d7
共有 1 个文件被更改,包括 3 次插入3 次删除
  1. 3 3
      core/src/main/java/org/elasticsearch/common/io/FileSystemUtils.java

+ 3 - 3
core/src/main/java/org/elasticsearch/common/io/FileSystemUtils.java

@@ -117,12 +117,12 @@ public final class FileSystemUtils {
     }
 
     /**
-     * Returns an InputStream the given url if the url has a protocol of 'file', no host, and no port.
+     * Returns an InputStream the given url if the url has a protocol of 'file' or 'jar', no host, and no port.
      */
     public static InputStream openFileURLStream(URL url) throws IOException {
         String protocol = url.getProtocol();
-        if ("file".equals(protocol) == false) {
-            throw new IllegalArgumentException("Invalid protocol [" + protocol + "], must be [file]");
+        if ("file".equals(protocol) == false && "jar".equals(protocol) == false) {
+            throw new IllegalArgumentException("Invalid protocol [" + protocol + "], must be [file] or [jar]");
         }
         if (Strings.isEmpty(url.getHost()) == false) {
             throw new IllegalArgumentException("URL cannot have host. Found: [" + url.getHost() + ']');