svn commit: r1133042 - /wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/DiskDataStore.java

[mgrigorov]

Author: mgrigorov
Date: Tue Jun  7 15:12:27 2011
New Revision: 1133042

URL: http://svn.apache.org/viewvc?rev=1133042&view=rev
Log:
Add some logging in DiskDataStore methods for storing, getting and removing a 
page.
No functional changes.


Modified:
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/DiskDataStore.java

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/DiskDataStore.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/DiskDataStore.java?rev=1133042&r1=1133041&r2=1133042&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/DiskDataStore.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/DiskDataStore.java
 Tue Jun  7 15:12:27 2011
@@ -58,7 +58,7 @@ public class DiskDataStore implements ID
 
        private final File fileStoreFolder;
 
-       private final ConcurrentMap<String, SessionEntry> sessionEntryMap = new 
ConcurrentHashMap<String, SessionEntry>();
+       private final ConcurrentMap<String, SessionEntry> sessionEntryMap;
 
        /**
         * Construct.
@@ -74,6 +74,7 @@ public class DiskDataStore implements ID
                this.applicationName = applicationName;
                this.fileStoreFolder = fileStoreFolder;
                maxSizePerPageSession = Args.notNull(maxSizePerSession, 
"maxSizePerSession");
+               sessionEntryMap = new ConcurrentHashMap<String, SessionEntry>();
 
                try
                {
@@ -96,8 +97,10 @@ public class DiskDataStore implements ID
         */
        public void destroy()
        {
+               log.debug("Destroying...");
                saveIndex();
                fileChannelPool.destroy();
+               log.debug("Destroyed.");
        }
 
        /**
@@ -105,13 +108,16 @@ public class DiskDataStore implements ID
         */
        public byte[] getData(final String sessionId, final int id)
        {
+               byte[] pageData = null;
                SessionEntry sessionEntry = getSessionEntry(sessionId, false);
-               if (sessionEntry == null)
+               if (sessionEntry != null)
                {
-                       return null;
+                       pageData = sessionEntry.loadPage(id);
                }
 
-               return sessionEntry.loadPage(id);
+               log.debug("Returning data{} for page with id '{}' in session 
with id '{}'", new Object[] {
+                               pageData != null ? "" : "(null)", id, sessionId 
});
+               return pageData;
        }
 
        /**
@@ -130,6 +136,8 @@ public class DiskDataStore implements ID
                SessionEntry sessionEntry = getSessionEntry(sessionId, false);
                if (sessionEntry != null)
                {
+                       log.debug("Removing data for page with id '{}' in 
session with id '{}'", new Object[] {
+                                       id, sessionId });
                        sessionEntry.removePage(id);
                }
        }
@@ -142,6 +150,7 @@ public class DiskDataStore implements ID
                SessionEntry sessionEntry = getSessionEntry(sessionId, false);
                if (sessionEntry != null)
                {
+                       log.debug("Removing data for pages in session with id 
'{}'", sessionId);
                        synchronized (sessionEntry)
                        {
                                sessionEntryMap.remove(sessionEntry.sessionId);
@@ -158,6 +167,8 @@ public class DiskDataStore implements ID
                SessionEntry sessionEntry = getSessionEntry(sessionId, true);
                if (sessionEntry != null)
                {
+                       log.debug("Stroing data for page with id '{}' in 
session with id '{}'", new Object[] {
+                                       id, sessionId });
                        sessionEntry.savePage(id, data);
                }
        }