Non-functional changes

Java 7 diamonds and removal of unnecessary 'if'

(cherry picked from commit daecdc6c40076855288ab551741bb56f36c331c6)


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/11df645a
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/11df645a
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/11df645a

Branch: refs/heads/master
Commit: 11df645ad6fdd54c2231099b83583b6b096c2cb0
Parents: 9e50533
Author: Martin Tzvetanov Grigorov <[email protected]>
Authored: Sun Jun 4 22:49:58 2017 +0200
Committer: Martin Tzvetanov Grigorov <[email protected]>
Committed: Sun Jun 4 22:51:22 2017 +0200

----------------------------------------------------------------------
 .../main/java/org/apache/wicket/pageStore/DiskDataStore.java | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/11df645a/wicket-core/src/main/java/org/apache/wicket/pageStore/DiskDataStore.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/main/java/org/apache/wicket/pageStore/DiskDataStore.java 
b/wicket-core/src/main/java/org/apache/wicket/pageStore/DiskDataStore.java
index c91890c..2dd95e4 100644
--- a/wicket-core/src/main/java/org/apache/wicket/pageStore/DiskDataStore.java
+++ b/wicket-core/src/main/java/org/apache/wicket/pageStore/DiskDataStore.java
@@ -181,10 +181,7 @@ public class DiskDataStore implements IDataStore
                SessionEntry sessionEntry = getSessionEntry(sessionId, true);
                if (sessionEntry != null)
                {
-                       if (log.isDebugEnabled())
-                       {
-                               log.debug("Storing data for page with id '{}' 
in session with id '{}'", id, sessionId);
-                       }
+                       log.debug("Storing data for page with id '{}' in 
session with id '{}'", id, sessionId);
                        sessionEntry.savePage(id, data);
                }
        }
@@ -262,8 +259,7 @@ public class DiskDataStore implements IDataStore
                                ObjectOutputStream oos = new 
ObjectOutputStream(stream);
                                try
                                {
-                                       Map<String, SessionEntry> map = new 
HashMap<String, SessionEntry>(
-                                               sessionEntryMap.size());
+                                       Map<String, SessionEntry> map = new 
HashMap<>(sessionEntryMap.size());
                                        for (Entry<String, SessionEntry> e : 
sessionEntryMap.entrySet())
                                        {
                                                if (e.getValue().unbound == 
false)

Reply via email to