You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directmemory.apache.org by no...@apache.org on 2012/11/08 14:04:03 UTC
svn commit: r1407039 - in /directmemory/lightning/trunk:
lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/
lightning-maven-plugin/src/main/java/org/apache/directmemory/lightning/maven/
Author: noctarius
Date: Thu Nov 8 13:04:03 2012
New Revision: 1407039
URL: http://svn.apache.org/viewvc?rev=1407039&view=rev
Log:
Corrected streams closing
Modified:
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/SerializableMarshaller.java
directmemory/lightning/trunk/lightning-maven-plugin/src/main/java/org/apache/directmemory/lightning/maven/SupportUtil.java
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/SerializableMarshaller.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/SerializableMarshaller.java?rev=1407039&r1=1407038&r2=1407039&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/SerializableMarshaller.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/SerializableMarshaller.java Thu Nov 8 13:04:03 2012
@@ -53,6 +53,7 @@ public class SerializableMarshaller
byte[] data = stream.toByteArray();
target.writeInt( data.length );
target.writeBytes( data );
+ oos.close();
}
@Override
@@ -61,18 +62,22 @@ public class SerializableMarshaller
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();
+ }
}
}
Modified: directmemory/lightning/trunk/lightning-maven-plugin/src/main/java/org/apache/directmemory/lightning/maven/SupportUtil.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-maven-plugin/src/main/java/org/apache/directmemory/lightning/maven/SupportUtil.java?rev=1407039&r1=1407038&r2=1407039&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-maven-plugin/src/main/java/org/apache/directmemory/lightning/maven/SupportUtil.java (original)
+++ directmemory/lightning/trunk/lightning-maven-plugin/src/main/java/org/apache/directmemory/lightning/maven/SupportUtil.java Thu Nov 8 13:04:03 2012
@@ -61,6 +61,7 @@ public final class SupportUtil
{
sb.append( line );
}
+ reader.close();
return sb.toString();
}
catch ( IOException e )