commit 8d5111890b9e2fe9223f10857dd5f73ed40d7d06
author Kenneth McFarland <kennethmcfarland@apache.org> Sun Jun 10 22:24:29 2018 -0700
committer Kenneth McFarland <kennethmcfarland@apache.org> Sun Jun 10 22:24:29 2018 -0700
tree 0b3bae8da93c7d89ea7fc9adc22c618d15539bad
parent 9b5277c9c79bb3a52bb879af591d1c51ae9476cc

FLUO-1038 Use try with resources for streams in FluoAdminImpl

modules/core/src/main/java/org/apache/fluo/core/client/FluoAdminImpl.java

diff --git a/modules/core/src/main/java/org/apache/fluo/core/client/FluoAdminImpl.java b/modules/core/src/main/java/org/apache/fluo/core/client/FluoAdminImpl.java
index 5210cc0..b2ee018 100644
--- a/modules/core/src/main/java/org/apache/fluo/core/client/FluoAdminImpl.java
+++ b/modules/core/src/main/java/org/apache/fluo/core/client/FluoAdminImpl.java
@@ -329,11 +329,11 @@
       }
     }
 
-    try {
+    try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
       CuratorFramework curator = getAppCurator();
       ObserverUtil.initialize(curator, config);
 
-      ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
       sharedProps.store(baos, "Shared java props");
 
       CuratorUtil.putData(curator, ZookeeperPath.CONFIG_SHARED, baos.toByteArray(),
@@ -451,13 +451,14 @@
     try (CuratorFramework curator = CuratorUtil.newAppCurator(config)) {
       curator.start();
 
-      ByteArrayInputStream bais =
-          new ByteArrayInputStream(curator.getData().forPath(ZookeeperPath.CONFIG_SHARED));
-      Properties sharedProps = new Properties();
-      sharedProps.load(bais);
+      try (ByteArrayInputStream bais =
+          new ByteArrayInputStream(curator.getData().forPath(ZookeeperPath.CONFIG_SHARED))) {
 
-      for (String prop : sharedProps.stringPropertyNames()) {
-        zooConfig.setProperty(prop, sharedProps.getProperty(prop));
+        Properties sharedProps = new Properties();
+        sharedProps.load(bais);
+        for (String prop : sharedProps.stringPropertyNames()) {
+          zooConfig.setProperty(prop, sharedProps.getProperty(prop));
+        }
       }
     } catch (Exception e) {
       throw new IllegalStateException(e);