hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r615248 - in /hadoop/core/trunk/src/contrib/hbase: CHANGES.txt src/java/org/apache/hadoop/hbase/Shell.java
Date Fri, 25 Jan 2008 15:45:04 GMT
Author: stack
Date: Fri Jan 25 07:45:04 2008
New Revision: 615248

URL: http://svn.apache.org/viewvc?rev=615248&view=rev
Log:
HADOOP-2706 HBase Shell crash

Modified:
    hadoop/core/trunk/src/contrib/hbase/CHANGES.txt
    hadoop/core/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/Shell.java

Modified: hadoop/core/trunk/src/contrib/hbase/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hbase/CHANGES.txt?rev=615248&r1=615247&r2=615248&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hbase/CHANGES.txt (original)
+++ hadoop/core/trunk/src/contrib/hbase/CHANGES.txt Fri Jan 25 07:45:04 2008
@@ -148,6 +148,7 @@
    HADOOP-2686 Removed tables stick around in .META.
    HADOOP-2688 IllegalArgumentException processing a shutdown stops
                server going down and results in millions of lines of output
+   HADOOP-2706 HBase Shell crash
    
   IMPROVEMENTS
    HADOOP-2401 Add convenience put method that takes writable

Modified: hadoop/core/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/Shell.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/Shell.java?rev=615248&r1=615247&r2=615248&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/Shell.java (original)
+++ hadoop/core/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/Shell.java Fri Jan
25 07:45:04 2008
@@ -114,12 +114,14 @@
         ReturnMsg rs = hql.executeQuery(queryStr.toString());
 
         long end = System.currentTimeMillis();
-        if (rs != null && rs.getType() > -1)
-          System.out.println(rs.getMsg() + executeTime((rs.getType() == 1), start, end));
-        else if (rs.getType() == -9)           
-          System.out.println(rs.getMsg());
-        
-          queryStr = new StringBuilder();
+        if (rs != null) {
+          if (rs != null && rs.getType() > -1)
+            System.out.println(rs.getMsg() +
+              executeTime((rs.getType() == 1), start, end));
+          else if (rs.getType() == -9)           
+            System.out.println(rs.getMsg());
+        }
+        queryStr = new StringBuilder();
       } else {
         queryStr.append(" " + extendedLine);
       }



Mime
View raw message