svn commit: r668262 - in /hadoop/hbase/branches/0.1: CHANGES.txt src/java/org/apache/hadoop/hbase/HStore.java

[ji...@apache.org]

Author: jimk
Date: Mon Jun 16 11:55:05 2008
New Revision: 668262

URL: http://svn.apache.org/viewvc?rev=668262&view=rev
Log:
HBASE-681   NPE in Memcache (Clint Morgan via Jim Kellerman)

Modified:
    hadoop/hbase/branches/0.1/CHANGES.txt
    hadoop/hbase/branches/0.1/src/java/org/apache/hadoop/hbase/HStore.java

Modified: hadoop/hbase/branches/0.1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.1/CHANGES.txt?rev=668262&r1=668261&r2=668262&view=diff
==============================================================================
--- hadoop/hbase/branches/0.1/CHANGES.txt (original)
+++ hadoop/hbase/branches/0.1/CHANGES.txt Mon Jun 16 11:55:05 2008
@@ -15,6 +15,7 @@
    HBASE-652   Dropping table fails silently if table isn't disabled 
    HBASE-674   Memcache size unreliable
    HBASE-665   server side scanner doesn't honor stop row
+   HBASE-681   NPE in Memcache (Clint Morgan via Jim Kellerman)
 
 Release 0.1.2 - 05/13/2008
 

Modified: hadoop/hbase/branches/0.1/src/java/org/apache/hadoop/hbase/HStore.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.1/src/java/org/apache/hadoop/hbase/HStore.java?rev=668262&r1=668261&r2=668262&view=diff
==============================================================================
--- hadoop/hbase/branches/0.1/src/java/org/apache/hadoop/hbase/HStore.java (original)
+++ hadoop/hbase/branches/0.1/src/java/org/apache/hadoop/hbase/HStore.java Mon Jun 16 11:55:05 2008
@@ -533,7 +533,7 @@
         HStoreKey key = es.getKey();
     
         // if there's no column name, then compare rows and timestamps
-        if (origin.getColumn().toString().equals("")) {
+        if (origin.getColumn() == null || origin.getColumn().getLength() == 0) {
           // if the current and origin row don't match, then we can jump
           // out of the loop entirely.
           if (!key.getRow().equals(origin.getRow())) {