svn commit: r640742 - in /wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util: io/IObjectStreamFactory.java lang/Objects.java

[jcompagner]

Author: jcompagner
Date: Tue Mar 25 01:39:12 2008
New Revision: 640742

URL: http://svn.apache.org/viewvc?rev=640742&view=rev
Log:
also close the read (byteToObject) so that the OIS can clean itself.
also according to doc the writeObjectOverride is expected to be final

Modified:
    
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/io/IObjectStreamFactory.java
    
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java

Modified: 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/io/IObjectStreamFactory.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/io/IObjectStreamFactory.java?rev=640742&r1=640741&r2=640742&view=diff
==============================================================================
--- 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/io/IObjectStreamFactory.java
 (original)
+++ 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/io/IObjectStreamFactory.java
 Tue Mar 25 01:39:12 2008
@@ -110,7 +110,7 @@
                        final ObjectOutputStream oos = new 
ObjectOutputStream(out);
                        return new ObjectOutputStream()
                        {
-                               protected void writeObjectOverride(final Object 
obj) throws IOException
+                               protected final void writeObjectOverride(final 
Object obj) throws IOException
                                {
                                        try
                                        {

Modified: 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java?rev=640742&r1=640741&r2=640742&view=diff
==============================================================================
--- 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java
 (original)
+++ 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java
 Tue Mar 25 01:39:12 2008
@@ -386,12 +386,18 @@
                try
                {
                        final ByteArrayInputStream in = new 
ByteArrayInputStream(data);
+                       ObjectInputStream ois = null;
                        try
                        {
-                               return 
objectStreamFactory.newObjectInputStream(in).readObject();
+                               ois = 
objectStreamFactory.newObjectInputStream(in);
+                               return ois.readObject();
                        }
                        finally
                        {
+                               if (ois != null)
+                               {
+                                       ois.close();
+                               }
                                in.close();
                        }
                }