Repository: flume Updated Branches: refs/heads/flume-1.5 aacd016a9 -> 839e8e67f
FLUME-2252. Add null check before closing table in HbaseSink (Gopinathan A via Hari Shreedharan) Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/839e8e67 Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/839e8e67 Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/839e8e67 Branch: refs/heads/flume-1.5 Commit: 839e8e67fd75b2f2af9898b4b82f9570981e329c Parents: aacd016 Author: Hari Shreedharan <[email protected]> Authored: Tue Mar 11 23:35:51 2014 -0700 Committer: Hari Shreedharan <[email protected]> Committed: Tue Mar 11 23:36:43 2014 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/flume/sink/hbase/AsyncHBaseSink.java | 4 +++- .../src/main/java/org/apache/flume/sink/hbase/HBaseSink.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/839e8e67/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 5316cd6..2d03271 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 @@ -460,7 +460,9 @@ public class AsyncHBaseSink extends AbstractSink implements Configurable { @Override public void stop(){ serializer.cleanUp(); - client.shutdown(); + if (client != null) { + client.shutdown(); + } sinkCounter.incrementConnectionClosedCount(); sinkCounter.stop(); sinkCallbackPool.shutdown(); http://git-wip-us.apache.org/repos/asf/flume/blob/839e8e67/flume-ng-sinks/flume-ng-hbase-sink/src/main/java/org/apache/flume/sink/hbase/HBaseSink.java ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-ng-hbase-sink/src/main/java/org/apache/flume/sink/hbase/HBaseSink.java b/flume-ng-sinks/flume-ng-hbase-sink/src/main/java/org/apache/flume/sink/hbase/HBaseSink.java index 9996a4e..5de0bd5 100644 --- a/flume-ng-sinks/flume-ng-hbase-sink/src/main/java/org/apache/flume/sink/hbase/HBaseSink.java +++ b/flume-ng-sinks/flume-ng-hbase-sink/src/main/java/org/apache/flume/sink/hbase/HBaseSink.java @@ -187,7 +187,9 @@ public class HBaseSink extends AbstractSink implements Configurable { @Override public void stop(){ try { - table.close(); + if (table != null) { + table.close(); + } table = null; } catch (IOException e) { throw new FlumeException("Error closing table.", e);
