You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by la...@apache.org on 2013/07/13 17:19:07 UTC
svn commit: r1502799 -
/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftHBaseServiceHandler.java
Author: larsgeorge
Date: Sat Jul 13 15:19:07 2013
New Revision: 1502799
URL: http://svn.apache.org/r1502799
Log:
HBASE-8938 Thrift2 does not close scanner instance (Hamed Madani)
Modified:
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftHBaseServiceHandler.java
Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftHBaseServiceHandler.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftHBaseServiceHandler.java?rev=1502799&r1=1502798&r2=1502799&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftHBaseServiceHandler.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftHBaseServiceHandler.java Sat Jul 13 15:19:07 2013
@@ -333,11 +333,17 @@ public class ThriftHBaseServiceHandler i
@Override
public void closeScanner(int scannerId) throws TIOError, TIllegalArgument, TException {
- if (removeScanner(scannerId) == null) {
+ LOG.debug("scannerClose: id=" + scannerId);
+ ResultScanner scanner = getScanner(scannerId);
+ if (scanner == null) {
+ String message = "scanner ID is invalid";
+ LOG.warn(message);
TIllegalArgument ex = new TIllegalArgument();
ex.setMessage("Invalid scanner Id");
throw ex;
}
+ scanner.close();
+ removeScanner(scannerId);
}
}