You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jo...@apache.org on 2007/05/24 20:38:07 UTC

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

Author: jonl
Date: Thu May 24 11:38:06 2007
New Revision: 541377

URL: http://svn.apache.org/viewvc?view=rev&rev=541377
Log:
Fix NPE on destroying when filter did not fully set up.

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

Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java?view=diff&rev=541377&r1=541376&r2=541377
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java Thu May 24 11:38:06 2007
@@ -97,8 +97,11 @@
 	 */
 	public void destroy()
 	{
-		this.webApplication.internalDestroy();
-		this.webApplication = null;
+		if (this.webApplication != null)
+		{
+			this.webApplication.internalDestroy();
+			this.webApplication = null;
+		}
 	}
 
 	/**
@@ -211,6 +214,7 @@
 					// Try to see if there is a redirect stored
 					ISessionStore sessionStore = webApplication.getSessionStore();
 					String sessionId = sessionStore.getSessionId(request, false);
+					System.out.println("THOOF-WICKET: Redirect to buffer for session id " + sessionId);
 					if (sessionId != null)
 					{
 						BufferedHttpServletResponse bufferedResponse = webApplication