accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ktur...@apache.org
Subject svn commit: r1222706 - /incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
Date Fri, 23 Dec 2011 15:51:08 GMT
Author: kturner
Date: Fri Dec 23 15:51:07 2011
New Revision: 1222706

URL: http://svn.apache.org/viewvc?rev=1222706&view=rev
Log:
ACCUMULO-226 applied fix for batch scanner has next

Modified:
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java?rev=1222706&r1=1222705&r2=1222706&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
(original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
Fri Dec 23 15:51:07 2011
@@ -174,7 +174,7 @@ public class TabletServerBatchReaderIter
     synchronized (nextLock) {
       // check if one was cached
       if (nextEntry != null)
-        return true;
+        return nextEntry.getKey() != null && nextEntry.getValue() != null;
       
       // don't have one cached, try to cache one and return success
       try {



Mime
View raw message