You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by ja...@apache.org on 2016/03/29 17:11:38 UTC

flume git commit: FLUME-2897: AsyncHBase sink NPE when Channel.getTransaction() fails

Repository: flume
Updated Branches:
  refs/heads/trunk caa64a1a6 -> 5293eba9a


FLUME-2897: AsyncHBase sink NPE when Channel.getTransaction() fails

(Mike Percy via Jarek Jarcec Cecho)


Project: http://git-wip-us.apache.org/repos/asf/flume/repo
Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/5293eba9
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/5293eba9
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/5293eba9

Branch: refs/heads/trunk
Commit: 5293eba9a418180b42b3138c0c0b5aac38361f7f
Parents: caa64a1
Author: Jarek Jarcec Cecho <ja...@apache.org>
Authored: Tue Mar 29 08:10:31 2016 -0700
Committer: Jarek Jarcec Cecho <ja...@apache.org>
Committed: Tue Mar 29 08:10:31 2016 -0700

----------------------------------------------------------------------
 .../main/java/org/apache/flume/sink/hbase/AsyncHBaseSink.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flume/blob/5293eba9/flume-ng-sinks/flume-ng-hbase-sink/src/main/java/org/apache/flume/sink/hbase/AsyncHBaseSink.java
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/flume-ng-hbase-sink/src/main/java/org/apache/flume/sink/hbase/AsyncHBaseSink.java b/flume-ng-sinks/flume-ng-hbase-sink/src/main/java/org/apache/flume/sink/hbase/AsyncHBaseSink.java
index eac00f6..c1ff0c4 100644
--- a/flume-ng-sinks/flume-ng-hbase-sink/src/main/java/org/apache/flume/sink/hbase/AsyncHBaseSink.java
+++ b/flume-ng-sinks/flume-ng-hbase-sink/src/main/java/org/apache/flume/sink/hbase/AsyncHBaseSink.java
@@ -204,10 +204,11 @@ public class AsyncHBaseSink extends AbstractSink implements Configurable {
 
     Status status = Status.READY;
     Channel channel = getChannel();
+    txn = channel.getTransaction();
+    txn.begin();
+
     int i = 0;
     try {
-      txn = channel.getTransaction();
-      txn.begin();
       for (; i < batchSize; i++) {
         Event event = channel.take();
         if (event == null) {