You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by ji...@apache.org on 2015/01/12 09:54:02 UTC

tajo git commit: TAJO-1293: Tajo have to accept hostname beginning with digits.

Repository: tajo
Updated Branches:
  refs/heads/master bc478ba83 -> d1a46c6b6


TAJO-1293: Tajo have to accept hostname beginning with digits.


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

Branch: refs/heads/master
Commit: d1a46c6b6e3d4f6c74519cffab1c0562640fb0e5
Parents: bc478ba
Author: Jihun Kang <ji...@apache.org>
Authored: Mon Jan 12 17:53:16 2015 +0900
Committer: Jihun Kang <ji...@apache.org>
Committed: Mon Jan 12 17:53:16 2015 +0900

----------------------------------------------------------------------
 CHANGES                                                           | 3 +++
 .../java/org/apache/tajo/validation/NetworkAddressValidator.java  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tajo/blob/d1a46c6b/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 5ff3143..54d72e1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -27,6 +27,9 @@ Release 0.9.1 - unreleased
 
   IMPROVEMENT
 
+    TAJO-1293: Tajo have to accept hostname beginning with digits.
+    (Jinhang Choi via jihun)
+
     TAJO-1281: Remove hadoop-common dependency from tajo-rpc. (hyunsik)
 
     TAJO-1291: Rename TajoMasterProtocol to QueryCoordinatorProtocol.

http://git-wip-us.apache.org/repos/asf/tajo/blob/d1a46c6b/tajo-common/src/main/java/org/apache/tajo/validation/NetworkAddressValidator.java
----------------------------------------------------------------------
diff --git a/tajo-common/src/main/java/org/apache/tajo/validation/NetworkAddressValidator.java b/tajo-common/src/main/java/org/apache/tajo/validation/NetworkAddressValidator.java
index 7477c4c..d16d33a 100644
--- a/tajo-common/src/main/java/org/apache/tajo/validation/NetworkAddressValidator.java
+++ b/tajo-common/src/main/java/org/apache/tajo/validation/NetworkAddressValidator.java
@@ -31,7 +31,7 @@ public class NetworkAddressValidator extends AbstractValidator {
   
   public NetworkAddressValidator() {
     hostnamePattern = Pattern.compile(
-        "^[a-zA-Z][-a-zA-Z0-9\\\\._]+$");
+        "^\\w[\\w-]*(\\.\\w[\\w-]*)*\\.[a-zA-Z][\\w-]*.?$|[a-zA-Z][\\w-]*.?$");
     portNumberPattern = Pattern.compile("^[1-6]?[0-9]{1,4}$");
   }