commit | 6ef12a8295339a93a51f327a57523c4e52ebbdb4 | [log] [tgz] |
---|---|---|
author | Christoph Engelbert <noctarius@apache.org> | Thu Nov 08 13:04:03 2012 +0000 |
committer | Christoph Engelbert <noctarius@apache.org> | Thu Nov 08 13:04:03 2012 +0000 |
tree | 9b3dc1f7f527875ad13a967f775d4d28ada2f82c | |
parent | 7019a5eb6c2fc41444b213c0d9cb19528dcbf72f [diff] |
Corrected streams closing git-svn-id: https://svn.apache.org/repos/asf/directmemory/lightning/trunk@1407039 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/SerializableMarshaller.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/SerializableMarshaller.java index 344a2f6..e87c426 100644 --- a/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/SerializableMarshaller.java +++ b/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/SerializableMarshaller.java
@@ -53,6 +53,7 @@ byte[] data = stream.toByteArray(); target.writeInt( data.length ); target.writeBytes( data ); + oos.close(); } @Override @@ -61,18 +62,22 @@ SerializationContext serializationContext ) throws IOException { + int length = source.readInt(); + byte[] data = new byte[length]; + source.readBytes( data ); + ByteArrayInputStream stream = new ByteArrayInputStream( data ); + ObjectInputStream ois = new ObjectInputStream( stream ); try { - int length = source.readInt(); - byte[] data = new byte[length]; - source.readBytes( data ); - ByteArrayInputStream stream = new ByteArrayInputStream( data ); - ObjectInputStream ois = new ObjectInputStream( stream ); return (V) ois.readObject(); } catch ( ClassNotFoundException e ) { throw new IOException( "Error while deserialization", e ); } + finally + { + ois.close(); + } } }
diff --git a/lightning-maven-plugin/src/main/java/org/apache/directmemory/lightning/maven/SupportUtil.java b/lightning-maven-plugin/src/main/java/org/apache/directmemory/lightning/maven/SupportUtil.java index f6cd05f..83b4c58 100644 --- a/lightning-maven-plugin/src/main/java/org/apache/directmemory/lightning/maven/SupportUtil.java +++ b/lightning-maven-plugin/src/main/java/org/apache/directmemory/lightning/maven/SupportUtil.java
@@ -61,6 +61,7 @@ { sb.append( line ); } + reader.close(); return sb.toString(); } catch ( IOException e )