svn commit: r548310 - /incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/FilePageStore.java

[almaw]

Author: almaw
Date: Mon Jun 18 04:02:16 2007
New Revision: 548310

URL: http://svn.apache.org/viewvc?view=rev&rev=548310
Log:
WICKET-625 - Wicket doesn't clean up properly when hot-deploying; hangs onto 
Class references. (partial fix, work in progress)

Modified:
    
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/FilePageStore.java

Modified: 
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/FilePageStore.java
URL: 
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/FilePageStore.java?view=diff&rev=548310&r1=548309&r2=548310
==============================================================================
--- 
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/FilePageStore.java
 (original)
+++ 
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/FilePageStore.java
 Mon Jun 18 04:02:16 2007
@@ -151,7 +151,7 @@
                        }
                        catch (Exception e)
                        {
-                               log.error("Error saving page " + key.pageClass 
+ " [" + key.id + ","
+                               log.error("Error saving page " + 
key.pageClassName + " [" + key.id + ","
                                                + key.versionNumber + "] for 
the sessionid " + key.sessionId);
                        }
                        finally
@@ -171,7 +171,7 @@
                        long t3 = System.currentTimeMillis();
                        if (log.isDebugEnabled())
                        {
-                               log.debug("storing page " + key.pageClass + "[" 
+ key.id + "," + key.versionNumber
+                               log.debug("storing page " + key.pageClassName + 
"[" + key.id + "," + key.versionNumber
                                                + "] size: " + length + " for 
session " + key.sessionId + " took "
                                                + (t3 - t1) + " miliseconds to 
save");
                        }
@@ -286,7 +286,7 @@
                private final int versionNumber;
                private final int ajaxVersionNumber;
                private final String pageMap;
-               private final Class pageClass;
+               private final String pageClassName;
 
                private volatile Object data;
 
@@ -303,7 +303,7 @@
                        this.id = id;
                        this.versionNumber = versionNumber;
                        this.ajaxVersionNumber = ajaxVersionNumber;
-                       this.pageClass = pageClass;
+                       this.pageClassName = pageClass == null ? null : 
pageClass.getName();
                        this.pageMap = pagemap;
                        this.data = page;
                }
@@ -713,7 +713,7 @@
                        serialized++;
                        if (log.isDebugEnabled() && bytes != null)
                        {
-                               log.debug("serializing page " + key.pageClass + 
"[" + key.id + "," + key.versionNumber
+                               log.debug("serializing page " + 
key.pageClassName + "[" + key.id + "," + key.versionNumber
                                                + "] size: " + bytes.length + " 
for session " + key.sessionId + " took "
                                                + (System.currentTimeMillis() - 
t1) + " miliseconds to serialize");
                        }