kafka-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From guozh...@apache.org
Subject [4/4] kafka git commit: Merge branch '0.10.0' of https://git-wip-us.apache.org/repos/asf/kafka into 0.10.0
Date Sat, 18 Jun 2016 18:52:25 GMT
Merge branch '0.10.0' of https://git-wip-us.apache.org/repos/asf/kafka into 0.10.0


Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/73ec226d
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/73ec226d
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/73ec226d

Branch: refs/heads/0.10.0
Commit: 73ec226d376abccac0db79e87b4058e25c27dd69
Parents: bef359e 8d38c11
Author: Guozhang Wang <wangguoz@gmail.com>
Authored: Sat Jun 18 11:51:27 2016 -0700
Committer: Guozhang Wang <wangguoz@gmail.com>
Committed: Sat Jun 18 11:51:27 2016 -0700

----------------------------------------------------------------------
 .../java/org/apache/kafka/streams/processor/StateStore.java | 4 +++-
 .../streams/processor/internals/ProcessorStateManager.java  | 4 ++++
 .../apache/kafka/streams/state/internals/RocksDBStore.java  | 9 +++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kafka/blob/73ec226d/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBStore.java
----------------------------------------------------------------------
diff --cc streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBStore.java
index a00de19,a6dc881..2a7f6b1
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBStore.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBStore.java
@@@ -427,16 -428,13 +431,21 @@@ public class RocksDBStore<K, V> impleme
  
      @Override
      public void close() {
+ 
+         if (db == null) {
+             return;
+         }
+ 
          flush();
 +        options.dispose();
 +        wOptions.dispose();
 +        fOptions.dispose();
          db.close();
 +
 +        options = null;
 +        wOptions = null;
 +        fOptions = null;
 +        db = null;
      }
  
      private static class RocksDbIterator<K, V> implements KeyValueIterator<K, V>
{


Mime
View raw message