You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by al...@apache.org on 2007/06/18 12:35:05 UTC

svn commit: r548289 - /incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java

Author: almaw
Date: Mon Jun 18 03:35:00 2007
New Revision: 548289

URL: http://svn.apache.org/viewvc?view=rev&rev=548289
Log:
Actually, back that out - classloader doesn't need to be a WeakRef here.

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

Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java?view=diff&rev=548289&r1=548288&r2=548289
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java Mon Jun 18 03:35:00 2007
@@ -24,7 +24,6 @@
 import java.io.ObjectOutputStream;
 import java.io.ObjectStreamClass;
 import java.io.OutputStream;
-import java.lang.ref.WeakReference;
 import java.lang.reflect.Array;
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -103,7 +102,7 @@
 
 	private static final class ReplaceObjectInputStream extends ObjectInputStream
 	{
-		private final WeakReference/*<ClassLoader>*/ classloaderRef;
+		private final ClassLoader classloader;
 		private HashMap replacedComponents;
 
 		private ReplaceObjectInputStream(InputStream in, HashMap replacedComponents,
@@ -111,7 +110,7 @@
 		{
 			super(in);
 			this.replacedComponents = replacedComponents;
-			this.classloaderRef = new WeakReference(classloader);
+			this.classloader = classloader;
 			enableResolveObject(true);
 		}
 
@@ -125,7 +124,7 @@
 
 			try
 			{
-				return Class.forName(className, true, (ClassLoader)classloaderRef.get());
+				return Class.forName(className, true, classloader);
 			}
 			catch (ClassNotFoundException ex1)
 			{