[hotfix] Remove some unecessary null checks in RocksDBKeyedStateBackend
Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/2b55ffbe Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/2b55ffbe Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/2b55ffbe Branch: refs/heads/master Commit: 2b55ffbe0101fae26281ae0324ffec5b577fb13c Parents: 4d19b1c Author: Stefan Richter <[email protected]> Authored: Fri Jan 5 18:21:27 2018 +0100 Committer: Stefan Richter <[email protected]> Committed: Sun Feb 25 15:10:28 2018 +0100 ---------------------------------------------------------------------- .../streaming/state/RocksDBKeyedStateBackend.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/2b55ffbe/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBKeyedStateBackend.java ---------------------------------------------------------------------- diff --git a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBKeyedStateBackend.java b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBKeyedStateBackend.java index 357a1dc..76cd5e4 100644 --- a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBKeyedStateBackend.java +++ b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBKeyedStateBackend.java @@ -805,7 +805,10 @@ public class RocksDBKeyedStateBackend<K> extends AbstractKeyedStateBackend<K> { /** The state meta data. */ private final List<RegisteredKeyedBackendStateMetaInfo.Snapshot<?, ?>> stateMetaInfoSnapshots = new ArrayList<>(); + /** Local filesystem for the RocksDB backup. */ private FileSystem backupFileSystem; + + /** Local path for the RocksDB backup. */ private Path backupPath; // Registry for all opened i/o streams @@ -868,11 +871,12 @@ public class RocksDBKeyedStateBackend<K> extends AbstractKeyedStateBackend<K> { return result; } finally { - if (inputStream != null && closeableRegistry.unregisterCloseable(inputStream)) { + + if (closeableRegistry.unregisterCloseable(inputStream)) { inputStream.close(); } - if (outputStream != null && closeableRegistry.unregisterCloseable(outputStream)) { + if (closeableRegistry.unregisterCloseable(outputStream)) { outputStream.close(); } } @@ -1190,8 +1194,7 @@ public class RocksDBKeyedStateBackend<K> extends AbstractKeyedStateBackend<K> { restoreKVStateMetaData(); restoreKVStateData(); } finally { - if (currentStateHandleInStream != null - && rocksDBKeyedStateBackend.cancelStreamRegistry.unregisterCloseable(currentStateHandleInStream)) { + if (rocksDBKeyedStateBackend.cancelStreamRegistry.unregisterCloseable(currentStateHandleInStream)) { IOUtils.closeQuietly(currentStateHandleInStream); } } @@ -1355,7 +1358,7 @@ public class RocksDBKeyedStateBackend<K> extends AbstractKeyedStateBackend<K> { return serializationProxy.getStateMetaInfoSnapshots(); } finally { - if (inputStream != null && stateBackend.cancelStreamRegistry.unregisterCloseable(inputStream)) { + if (stateBackend.cancelStreamRegistry.unregisterCloseable(inputStream)) { inputStream.close(); } } @@ -1387,11 +1390,11 @@ public class RocksDBKeyedStateBackend<K> extends AbstractKeyedStateBackend<K> { outputStream.write(buffer, 0, numBytes); } } finally { - if (inputStream != null && stateBackend.cancelStreamRegistry.unregisterCloseable(inputStream)) { + if (stateBackend.cancelStreamRegistry.unregisterCloseable(inputStream)) { inputStream.close(); } - if (outputStream != null && stateBackend.cancelStreamRegistry.unregisterCloseable(outputStream)) { + if (stateBackend.cancelStreamRegistry.unregisterCloseable(outputStream)) { outputStream.close(); } }
