incubator-accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ktur...@apache.org
Subject svn commit: r1222707 - in /incubator/accumulo/trunk: ./ src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
Date Fri, 23 Dec 2011 15:54:42 GMT
Author: kturner
Date: Fri Dec 23 15:54:42 2011
New Revision: 1222707

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

Modified:
    incubator/accumulo/trunk/   (props changed)
    incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java

Propchange: incubator/accumulo/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 23 15:54:42 2011
@@ -1,3 +1,3 @@
 /incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320
 /incubator/accumulo/branches/1.3.5rc:1209938
-/incubator/accumulo/branches/1.4:1201902-1215237
+/incubator/accumulo/branches/1.4:1201902-1222706

Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java?rev=1222707&r1=1222706&r2=1222707&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
(original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
Fri Dec 23 15:54:42 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