You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2014/03/11 15:53:40 UTC
svn commit: r1576371 -
/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSHDFSUtils.java
Author: tedyu
Date: Tue Mar 11 14:53:39 2014
New Revision: 1576371
URL: http://svn.apache.org/r1576371
Log:
HBASE-10717 TestFSHDFSUtils#testIsSameHdfs fails with IllegalArgumentException running against hadoop 2.3
Modified:
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSHDFSUtils.java
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSHDFSUtils.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSHDFSUtils.java?rev=1576371&r1=1576370&r2=1576371&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSHDFSUtils.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSHDFSUtils.java Tue Mar 11 14:53:39 2014
@@ -85,7 +85,12 @@ public class FSHDFSUtils extends FSUtils
}
} else {
URI uri = fs.getUri();
- InetSocketAddress addr = new InetSocketAddress(uri.getHost(), uri.getPort());
+ int port = uri.getPort();
+ if (port < 0) {
+ int idx = serviceName.indexOf(':');
+ port = Integer.parseInt(serviceName.substring(idx+1));
+ }
+ InetSocketAddress addr = new InetSocketAddress(uri.getHost(), port);
addresses.add(addr);
}