You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/10/03 17:14:28 UTC
git commit: ACCUMULO-3182 Fix incorrect fix at bad merge.
Repository: accumulo
Updated Branches:
refs/heads/master dc0d01ce8 -> 29ca17769
ACCUMULO-3182 Fix incorrect fix at bad merge.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/29ca1776
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/29ca1776
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/29ca1776
Branch: refs/heads/master
Commit: 29ca17769803cb5d43e520effd6a235e844748b1
Parents: dc0d01c
Author: Josh Elser <el...@apache.org>
Authored: Fri Oct 3 11:14:07 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Oct 3 11:14:07 2014 -0400
----------------------------------------------------------------------
.../accumulo/tserver/replication/AccumuloReplicaSystem.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/29ca1776/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
index fa9f5b1..4079a65 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
@@ -284,7 +284,7 @@ public class AccumuloReplicaSystem implements ReplicaSystem {
AccumuloException, AccumuloSecurityException {
final Set<Integer> tids;
- DataInputStream input = null;
+ final DataInputStream input;
Span span = Trace.start("Read WAL header");
span.data("file", p.toString());
try {
@@ -307,6 +307,7 @@ public class AccumuloReplicaSystem implements ReplicaSystem {
} finally {
span.stop();
}
+ return newStatus;
} catch (IOException e) {
log.error("Could not create stream for WAL", e);
// No data sent (bytes nor records) and no progress made