svn commit: r990458 - /wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java

[ivaynberg]

Author: ivaynberg
Date: Sat Aug 28 22:23:41 2010
New Revision: 990458

URL: http://svn.apache.org/viewvc?rev=990458&view=rev
Log:

Issue: WICKET-2722

Modified:
    
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java

Modified: 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java?rev=990458&r1=990457&r2=990458&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java
 (original)
+++ 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java
 Sat Aug 28 22:23:41 2010
@@ -98,8 +98,6 @@ public class RequestLogger implements IR
 
        private final Map<String, SessionData> liveSessions;
 
-       private final ThreadLocal<RequestData> currentRequest = new 
ThreadLocal<RequestData>();
-
        private final AtomicInteger active = new AtomicInteger();
 
        /**
@@ -161,7 +159,7 @@ public class RequestLogger implements IR
 
        public SessionData[] getLiveSessions()
        {
-               SessionData[] sessions = liveSessions.values().toArray(new 
SessionData[0]);
+               SessionData[] sessions = liveSessions.values().toArray(new 
SessionData[liveSessions.values().size()]);
                Arrays.sort(sessions);
                return sessions;
        }
@@ -243,7 +241,7 @@ public class RequestLogger implements IR
                        if (sessionId != null)
                        {
                                SessionData sd = liveSessions.get(sessionId);
-                               if (sd == null)
+                               if (sd == null && 
session.isSessionInvalidated() == false)
                                {
                                        // passivated session or logger only 
started after it.
                                        sessionCreated(sessionId);