You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2014/10/03 02:55:07 UTC
git commit: ACCUMULO-3182 Attempt to fix bad merge
Repository: accumulo
Updated Branches:
refs/heads/master 089408d59 -> dc0d01ce8
ACCUMULO-3182 Attempt to fix bad merge
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dc0d01ce
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dc0d01ce
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dc0d01ce
Branch: refs/heads/master
Commit: dc0d01ce8ca5a9f7642ec53017476db2c01d91b4
Parents: 089408d
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Oct 2 20:51:20 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Oct 2 20:51:20 2014 -0400
----------------------------------------------------------------------
.../tserver/replication/AccumuloReplicaSystem.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/dc0d01ce/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 bed2d89..fa9f5b1 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
@@ -62,6 +62,7 @@ import org.apache.accumulo.trace.instrument.Span;
import org.apache.accumulo.trace.instrument.Trace;
import org.apache.accumulo.tserver.log.DfsLogger;
import org.apache.accumulo.tserver.log.DfsLogger.DFSLoggerInputStreams;
+import org.apache.accumulo.tserver.log.DfsLogger.LogHeaderIncompleteException;
import org.apache.accumulo.tserver.logger.LogFileKey;
import org.apache.accumulo.tserver.logger.LogFileValue;
import org.apache.commons.lang.StringUtils;
@@ -283,7 +284,7 @@ public class AccumuloReplicaSystem implements ReplicaSystem {
AccumuloException, AccumuloSecurityException {
final Set<Integer> tids;
- final DataInputStream input;
+ DataInputStream input = null;
Span span = Trace.start("Read WAL header");
span.data("file", p.toString());
try {
@@ -399,8 +400,8 @@ public class AccumuloReplicaSystem implements ReplicaSystem {
private TCredentials tcreds;
private Set<Integer> tids;
- public WalClientExecReturn(ReplicationTarget target, DataInputStream input, Path p, Status status, long sizeLimit, String remoteTableId, TCredentials tcreds,
- Set<Integer> tids) {
+ public WalClientExecReturn(ReplicationTarget target, DataInputStream input, Path p, Status status, long sizeLimit, String remoteTableId,
+ TCredentials tcreds, Set<Integer> tids) {
this.target = target;
this.input = input;
this.p = p;
@@ -449,7 +450,8 @@ public class AccumuloReplicaSystem implements ReplicaSystem {
private String remoteTableId;
private TCredentials tcreds;
- public RFileClientExecReturn(ReplicationTarget target, DataInputStream input, Path p, Status status, long sizeLimit, String remoteTableId, TCredentials tcreds) {
+ public RFileClientExecReturn(ReplicationTarget target, DataInputStream input, Path p, Status status, long sizeLimit, String remoteTableId,
+ TCredentials tcreds) {
this.target = target;
this.input = input;
this.p = p;