[Title] Added tryclose(stream)

[Desc.]
[Issue]

Change-Id: I540e3be56a375c54e45c5771f851ed8a47f7f696

diff --git a/org.tizen.common.builder/src/org/tizen/common/builder/Resource.java b/org.tizen.common.builder/src/org/tizen/common/builder/Resource.java
index f0a32b9..f132548 100755 (executable)
--- a/org.tizen.common.builder/src/org/tizen/common/builder/Resource.java
+++ b/org.tizen.common.builder/src/org/tizen/common/builder/Resource.java
@@ -37,6 +37,7 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.tizen.common.file.FileHandler;\r
 import org.tizen.common.file.FileHandler.Attribute;\r
 import org.tizen.common.file.IResource;\r
+import org.tizen.common.util.IOUtil;\r
 \r
 public class\r
 Resource implements IResource\r
@@ -83,7 +84,13 @@ Resource implements IResource
     \r
     public void setContents( byte[] contents ) throws IOException\r
     {\r
-        setContents( new ByteArrayInputStream( contents ) );\r
+        ByteArrayInputStream bais = null;\r
+        try {\r
+            bais = new ByteArrayInputStream( contents );\r
+            setContents( bais );\r
+        } finally {\r
+            IOUtil.tryClose(bais);\r
+        }\r
     }\r
     \r
     @Override\r

diff --git a/org.tizen.common/src/org/tizen/common/core/command/file/WriteFileCommand.java b/org.tizen.common/src/org/tizen/common/core/command/file/WriteFileCommand.java
index b8a1f62..9902d6a 100644 (file)
--- a/org.tizen.common/src/org/tizen/common/core/command/file/WriteFileCommand.java
+++ b/org.tizen.common/src/org/tizen/common/core/command/file/WriteFileCommand.java
@@ -25,9 +25,11 @@
 package org.tizen.common.core.command.file;
 
 import java.io.ByteArrayInputStream;
+import java.io.InputStream;
 
 import org.tizen.common.core.command.ExecutionContext;
 import org.tizen.common.core.command.Executor;
+import org.tizen.common.util.IOUtil;
 import org.tizen.common.util.ObjectUtil;
 
 public class
@@ -55,10 +57,16 @@ extends FileHandlingCommand<Boolean>
            
            logger.trace( "Trying write {} in {} bytes", path, safeBytes.length );
            
-           context.getFileHandler().write(
-               path,
-               new ByteArrayInputStream( safeBytes )
-           );
+           InputStream is = null;
+           try {
+               is = new ByteArrayInputStream( safeBytes );
+               context.getFileHandler().write(
+                       path,
+                       is
+                       );
+           } finally {
+               IOUtil.tryClose(is);
+           }
        }
 
 }

diff --git a/org.tizen.common/src/org/tizen/common/core/command/zip/ZipCommand.java b/org.tizen.common/src/org/tizen/common/core/command/zip/ZipCommand.java
index aed38b4..8318223 100755 (executable)
--- a/org.tizen.common/src/org/tizen/common/core/command/zip/ZipCommand.java
+++ b/org.tizen.common/src/org/tizen/common/core/command/zip/ZipCommand.java
@@ -32,6 +32,7 @@ import static org.tizen.common.util.IOUtil.tryClose;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.text.MessageFormat;
 import java.util.Collection;
@@ -170,14 +171,17 @@ extends FileHandlingCommand<Object>
             tryClose( zipOut );
         }
 
+        InputStream is = new ByteArrayInputStream( byteOut.toByteArray() );
         try {
-            handler.write( path, new ByteArrayInputStream( byteOut.toByteArray() ) );
+            handler.write( path, is );
             context.getPrompter().notify( MessageFormat.format( "Widget( {0} ) is created successfully.", path ) );
         }
         catch ( IOException e )
         {
             throw new IllegalStateException( e );
             // TODO Handle
+        } finally {
+            tryClose(is);
         }
     }