svn commit: r1141520 - /wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java

[dashorst]

Author: dashorst
Date: Thu Jun 30 12:57:37 2011
New Revision: 1141520

URL: http://svn.apache.org/viewvc?rev=1141520&view=rev
Log:
Closes WICKET-3839 (other items were solved in previous commit, related to 
WICKET-3832

Modified:
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java?rev=1141520&r1=1141519&r2=1141520&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java
 Thu Jun 30 12:57:37 2011
@@ -36,6 +36,7 @@ import org.apache.wicket.request.handler
 import org.apache.wicket.request.handler.IPageRequestHandler;
 import org.apache.wicket.request.handler.ListenerInterfaceRequestHandler;
 import 
org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
+import org.apache.wicket.settings.IRequestLoggerSettings;
 import org.apache.wicket.util.lang.Classes;
 import org.apache.wicket.util.string.AppendingStringBuffer;
 import org.apache.wicket.util.string.Strings;
@@ -96,7 +97,11 @@ public class RequestLogger implements IR
                        public void add(int index, RequestData o)
                        {
                                super.add(index, o);
-                               if (size() > 
Application.get().getRequestLoggerSettings().getRequestsWindowSize())
+
+                               // should not happen often that the requests 
window size changes, but now we can
+                               // increase and shrink the list at will.
+                               IRequestLoggerSettings settings = 
Application.get().getRequestLoggerSettings();
+                               while (size() > Math.max(0, 
settings.getRequestsWindowSize()))
                                {
                                        removeLast();
                                }
@@ -248,7 +253,7 @@ public class RequestLogger implements IR
                        Page page = (Page)value;
                        rd.addEntry("Page removed, id: " + page.getId() + ", 
class:" + page.getClass());
                }
-               else if (value instanceof WebSession)
+               else if (value instanceof Session)
                {
                        rd.addEntry("Session removed");
                }