chukwa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From asrab...@apache.org
Subject svn commit: r784325 - in /hadoop/chukwa/trunk/src: java/org/apache/hadoop/chukwa/datacollection/sender/RetryListOfCollectors.java test/org/apache/hadoop/chukwa/datacollection/sender/TestRetryListOfCollectors.java
Date Sat, 13 Jun 2009 01:16:23 GMT
Author: asrabkin
Date: Sat Jun 13 01:16:23 2009
New Revision: 784325

URL: http://svn.apache.org/viewvc?rev=784325&view=rev
Log:
CHUKWA-291. Fix for previous fix

Modified:
    hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/sender/RetryListOfCollectors.java
    hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/datacollection/sender/TestRetryListOfCollectors.java

Modified: hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/sender/RetryListOfCollectors.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/sender/RetryListOfCollectors.java?rev=784325&r1=784324&r2=784325&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/sender/RetryListOfCollectors.java
(original)
+++ hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/sender/RetryListOfCollectors.java
Sat Jun 13 01:16:23 2009
@@ -57,13 +57,13 @@
       while ((line = br.readLine()) != null) {
         if (!line.contains("://")) {
           // no protocol, assume http
-          if (line.matches(".*:\\d+")) {
+          if (line.matches(".*:\\d+.*")) {
             parsedline = "http://" + line+"/";
           } else {
             parsedline = "http://" + line + ":" + portNo;
           }
         } else {
-          if (line.matches(".*:\\d+")) {
+          if (line.matches(".*:\\d+.*")) {
             parsedline = line;
           } else {
             parsedline = line + ":" + portNo;

Modified: hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/datacollection/sender/TestRetryListOfCollectors.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/datacollection/sender/TestRetryListOfCollectors.java?rev=784325&r1=784324&r2=784325&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/datacollection/sender/TestRetryListOfCollectors.java
(original)
+++ hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/datacollection/sender/TestRetryListOfCollectors.java
Sat Jun 13 01:16:23 2009
@@ -57,18 +57,18 @@
     PrintWriter out = new PrintWriter(new FileOutputStream(tmpOutput));
     
     HashSet<String> validHosts = new HashSet<String>();
-    validHosts.add("http://host1:5052");
-    validHosts.add("http://host2:5050");
-    validHosts.add("http://host3:5052");
-    validHosts.add("http://host4:5050");
-    validHosts.add("http://host5:5052");
-    validHosts.add("http://host6:5052");
+    validHosts.add("http://host1:5052/");
+    validHosts.add("http://host2:5050/");
+    validHosts.add("http://host3:5052/");
+    validHosts.add("http://host4:5050/");
+    validHosts.add("http://host5:5052/");
+    validHosts.add("http://host6:5052/");
     
     out.println("host1");
     out.println("host2:5050");
     out.println("http://host3");
     out.println("http://host4:5050");
-    out.println("http://host5:5052");
+    out.println("http://host5:5052/");
     out.println("host6:5052");
     out.close();
     



Mime
View raw message