You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by tu...@apache.org on 2012/04/26 22:36:43 UTC
svn commit: r1331075 - in
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common:
CHANGES.txt src/main/java/org/apache/hadoop/fs/FsUrlStreamHandlerFactory.java
Author: tucu
Date: Thu Apr 26 20:36:43 2012
New Revision: 1331075
URL: http://svn.apache.org/viewvc?rev=1331075&view=rev
Log:
Merge -r 1331072:1331073 from trunk to branch. FIXES: HADOOP-8321
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsUrlStreamHandlerFactory.java
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1331075&r1=1331074&r2=1331075&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Thu Apr 26 20:36:43 2012
@@ -262,6 +262,8 @@ Release 2.0.0 - UNRELEASED
HADOOP-8310. FileContext#checkPath should handle URIs with no port. (atm)
+ HADOOP-8321. TestUrlStreamHandler fails. (tucu)
+
BREAKDOWN OF HADOOP-7454 SUBTASKS
HADOOP-7455. HA: Introduce HA Service Protocol Interface. (suresh)
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsUrlStreamHandlerFactory.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsUrlStreamHandlerFactory.java?rev=1331075&r1=1331074&r2=1331075&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsUrlStreamHandlerFactory.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsUrlStreamHandlerFactory.java Thu Apr 26 20:36:43 2012
@@ -17,6 +17,7 @@
*/
package org.apache.hadoop.fs;
+import java.io.IOException;
import java.net.URLStreamHandlerFactory;
import java.util.HashMap;
import java.util.Map;
@@ -50,25 +51,23 @@ public class FsUrlStreamHandlerFactory i
private java.net.URLStreamHandler handler;
public FsUrlStreamHandlerFactory() {
- this.conf = new Configuration();
- // force the resolution of the configuration files
- // this is required if we want the factory to be able to handle
- // file:// URLs
- this.conf.getClass("fs.file.impl", null);
- this.handler = new FsUrlStreamHandler(this.conf);
+ this(new Configuration());
}
public FsUrlStreamHandlerFactory(Configuration conf) {
this.conf = new Configuration(conf);
- // force the resolution of the configuration files
- this.conf.getClass("fs.file.impl", null);
this.handler = new FsUrlStreamHandler(this.conf);
}
public java.net.URLStreamHandler createURLStreamHandler(String protocol) {
if (!protocols.containsKey(protocol)) {
- boolean known =
- (conf.getClass("fs." + protocol + ".impl", null) != null);
+ boolean known = true;
+ try {
+ FileSystem.getFileSystemClass(protocol, conf);
+ }
+ catch (IOException ex) {
+ known = false;
+ }
protocols.put(protocol, known);
}
if (protocols.get(protocol)) {