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/03/05 23:49:12 UTC
svn commit: r1453062 - in
/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver:
ReplicationHLogReaderManager.java ReplicationSource.java
Author: larsh
Date: Tue Mar 5 22:49:12 2013
New Revision: 1453062
URL: http://svn.apache.org/r1453062
Log:
HBASE-7944 Addendum (Jeffrey Zhong)
Modified:
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationHLogReaderManager.java
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
Modified: hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationHLogReaderManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationHLogReaderManager.java?rev=1453062&r1=1453061&r2=1453062&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationHLogReaderManager.java (original)
+++ hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationHLogReaderManager.java Tue Mar 5 22:49:12 2013
@@ -64,6 +64,7 @@ public class ReplicationHLogReaderManage
// Detect if this is a new file, if so get a new reader else
// reset the current reader so that we see the new data
if (this.reader == null || !this.lastPath.equals(path)) {
+ this.closeReader();
this.reader = HLogFactory.createReader(this.fs, path, this.conf);
this.lastPath = path;
} else {
Modified: hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java?rev=1453062&r1=1453061&r2=1453062&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java (original)
+++ hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java Tue Mar 5 22:49:12 2013
@@ -365,6 +365,7 @@ public class ReplicationSource extends T
}
} finally {
try {
+ this.reader = null;
this.repLogReader.closeReader();
} catch (IOException e) {
gotIOE = true;