hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zhang...@apache.org
Subject [30/50] [abbrv] hadoop git commit: Revert "Disable caching for JarURLConnection to avoid sharing JarFile with other users when loading resource from URL in Configuration class. Contributed by Zhihai Xu"
Date Wed, 23 Sep 2015 08:10:28 GMT
Revert "Disable caching for JarURLConnection to avoid sharing JarFile with other users when
loading resource from URL in Configuration class. Contributed by Zhihai Xu"

This reverts commit e690a32e57bc14b0cca0e2d39da513841d81b4fc.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3732d523
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3732d523
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3732d523

Branch: refs/heads/HDFS-7966
Commit: 3732d5238a9aa81514e27c7f0feabc454b57134b
Parents: 372ad27
Author: Zhihai Xu <zxu@apache.org>
Authored: Fri Sep 18 10:30:40 2015 -0700
Committer: Zhihai Xu <zxu@apache.org>
Committed: Fri Sep 18 10:30:40 2015 -0700

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt          |  4 ----
 .../main/java/org/apache/hadoop/conf/Configuration.java  | 11 +----------
 2 files changed, 1 insertion(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/3732d523/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 2bf5c9d..54d7b6b 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -782,10 +782,6 @@ Release 2.8.0 - UNRELEASED
     HADOOP-12413. AccessControlList should avoid calling getGroupNames in
     isUserInList with empty groups. (Zhihai Xu via cnauroth)
 
-    HADOOP-12404. Disable caching for JarURLConnection to avoid sharing
-    JarFile with other users when loading resource from URL in Configuration
-    class. (zxu)
-
   OPTIMIZATIONS
 
     HADOOP-11785. Reduce the number of listStatus operation in distcp

http://git-wip-us.apache.org/repos/asf/hadoop/blob/3732d523/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
index 8801c6c..0b45429 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
@@ -34,9 +34,7 @@ import java.io.Reader;
 import java.io.Writer;
 import java.lang.ref.WeakReference;
 import java.net.InetSocketAddress;
-import java.net.JarURLConnection;
 import java.net.URL;
-import java.net.URLConnection;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -2533,14 +2531,7 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
     if (url == null) {
       return null;
     }
-
-    URLConnection connection = url.openConnection();
-    if (connection instanceof JarURLConnection) {
-      // Disable caching for JarURLConnection to avoid sharing JarFile
-      // with other users.
-      connection.setUseCaches(false);
-    }
-    return parse(builder, connection.getInputStream(), url.toString());
+    return parse(builder, url.openStream(), url.toString());
   }
 
   private Document parse(DocumentBuilder builder, InputStream is,


Mime
View raw message