CLOUDSTACK-8656: closeable in vmsd reader

DaanHoogland · DaanHoogland · commit e44eea7db13d · 2015-08-04T01:01:49.000+02:00
moved closeable util function up the hierarchy
diff --git a/framework/db/src/com/cloud/utils/db/DbUtil.java b/framework/db/src/com/cloud/utils/db/DbUtil.java
@@ -43,6 +43,8 @@
 
 import org.apache.log4j.Logger;
 
+import static com.cloud.utils.AutoCloseableUtil.closeAutoCloseable;
+
 public class DbUtil {
     protected final static Logger s_logger = Logger.getLogger(DbUtil.class);
 
@@ -284,16 +286,4 @@ public static void closeConnection(final Connection connection) {
         closeAutoCloseable(connection, "exception while close connection.");
     }
 
-    public static void closeAutoCloseable(AutoCloseable ac, String message) {
-        try {
-
-            if (ac != null) {
-                ac.close();
-            }
-
-        } catch (Exception e) {
-            s_logger.warn("[ignored] " + message, e);
-        }
-    }
-
 }
diff --git a/utils/src/com/cloud/utils/AutoCloseableUtil.java b/utils/src/com/cloud/utils/AutoCloseableUtil.java
@@ -0,0 +1,20 @@
+package com.cloud.utils;
+
+import org.apache.log4j.Logger;
+
+public class AutoCloseableUtil {
+    private final static Logger s_logger = Logger.getLogger(AutoCloseableUtil.class);
+
+    public static void closeAutoCloseable(AutoCloseable ac, String message) {
+        try {
+
+            if (ac != null) {
+                ac.close();
+            }
+
+        } catch (Exception e) {
+            s_logger.warn("[ignored] " + message, e);
+        }
+    }
+
+}
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/SnapshotDescriptor.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/SnapshotDescriptor.java
@@ -28,6 +28,8 @@
 
 import org.apache.log4j.Logger;
 
+import static com.cloud.utils.AutoCloseableUtil.closeAutoCloseable;;
+
 public class SnapshotDescriptor {
     private static final Logger s_logger = Logger.getLogger(SnapshotDescriptor.class);
 
@@ -166,12 +168,7 @@ public byte[] getVmsdContent() {
             assert (false);
             s_logger.error("Unexpected exception ", e);
         } finally {
-            if (out != null) {
-                try {
-                    out.close();
-                } catch (IOException e) {
-                }
-            }
+            closeAutoCloseable(out, "buffered write for bytestream");
         }
 
         return bos.toByteArray();
