You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by nk...@apache.org on 2013/07/18 20:08:58 UTC
svn commit: r1504574 - in /hbase/branches/0.95:
hbase-client/src/main/java/org/apache/hadoop/hbase/ServerName.java
hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java
Author: nkeywal
Date: Thu Jul 18 18:08:58 2013
New Revision: 1504574
URL: http://svn.apache.org/r1504574
Log:
HBASE-8981 add a check on the ServerName parse
Modified:
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerName.java
hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java
Modified: hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerName.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerName.java?rev=1504574&r1=1504573&r2=1504574&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerName.java (original)
+++ hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerName.java Thu Jul 18 18:08:58 2013
@@ -128,6 +128,9 @@ public class ServerName implements Compa
if (serverName == null || serverName.length() <= 0) {
throw new IllegalArgumentException("Passed hostname is null or empty");
}
+ if (!Character.isLetterOrDigit(serverName.charAt(0))) {
+ throw new IllegalArgumentException("Bad passed hostname, serverName=" + serverName);
+ }
int index = serverName.indexOf(SERVERNAME_SEPARATOR);
return serverName.substring(0, index);
}
Modified: hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java?rev=1504574&r1=1504573&r2=1504574&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java (original)
+++ hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java Thu Jul 18 18:08:58 2013
@@ -130,7 +130,7 @@ public class TestHCM {
final HConnectionImplementation hci = (HConnectionImplementation)t.getConnection();
while (t.getRegionLocation(rk).getPort() != sn.getPort()){
TEST_UTIL.getHBaseAdmin().move(t.getRegionLocation(rk).getRegionInfo().
- getEncodedNameAsBytes(), sn.getVersionedBytes());
+ getEncodedNameAsBytes(), Bytes.toBytes(sn.toString()));
while(TEST_UTIL.getHBaseCluster().getMaster().getAssignmentManager().
getRegionStates().isRegionsInTransition()){
Thread.sleep(1);