svn commit: r1206701 - /wicket/branches/wicket-1.5.x/wicket-core/src/main/java/org/apache/wicket/serialize/java/JavaSerializer.java

[mg...@apache.org]

Author: mgrigorov
Date: Sun Nov 27 11:46:22 2011
New Revision: 1206701

URL: http://svn.apache.org/viewvc?rev=1206701&view=rev
Log:
WICKET-4264

JavaSerializer Does Not Call SerializableChecker


Modified:
    wicket/branches/wicket-1.5.x/wicket-core/src/main/java/org/apache/wicket/serialize/java/JavaSerializer.java

Modified: wicket/branches/wicket-1.5.x/wicket-core/src/main/java/org/apache/wicket/serialize/java/JavaSerializer.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.5.x/wicket-core/src/main/java/org/apache/wicket/serialize/java/JavaSerializer.java?rev=1206701&r1=1206700&r2=1206701&view=diff
==============================================================================
--- wicket/branches/wicket-1.5.x/wicket-core/src/main/java/org/apache/wicket/serialize/java/JavaSerializer.java (original)
+++ wicket/branches/wicket-1.5.x/wicket-core/src/main/java/org/apache/wicket/serialize/java/JavaSerializer.java Sun Nov 27 11:46:22 2011
@@ -235,17 +235,19 @@ public class JavaSerializer implements I
 	 */
 	private static class CheckerObjectOutputStream extends ObjectOutputStream
 	{
+		private final ObjectOutputStream oos;
+
 		public CheckerObjectOutputStream(OutputStream out) throws IOException
 		{
-			super(out);
+			oos = new ObjectOutputStream(out);
 		}
 
 		@Override
-		protected final void writeObjectOverride(final Object obj) throws IOException
+		protected final void writeObjectOverride(Object obj) throws IOException
 		{
 			try
 			{
-				super.writeObject(obj);
+				oos.writeObject(obj);
 			}
 			catch (NotSerializableException nsx)
 			{
@@ -270,13 +272,13 @@ public class JavaSerializer implements I
 		@Override
 		public void flush() throws IOException
 		{
-			super.flush();
+			oos.flush();
 		}
 
 		@Override
 		public void close() throws IOException
 		{
-			super.close();
+			oos.close();
 		}
 	}
 }