You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2017/06/04 20:51:16 UTC
wicket git commit: Non-functional changes
Repository: wicket
Updated Branches:
refs/heads/wicket-7.x 95fcc140d -> daecdc6c4
Non-functional changes
Java 7 diamonds and removal of unnecessary 'if'
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/daecdc6c
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/daecdc6c
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/daecdc6c
Branch: refs/heads/wicket-7.x
Commit: daecdc6c40076855288ab551741bb56f36c331c6
Parents: 95fcc14
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sun Jun 4 22:49:58 2017 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sun Jun 4 22:49:58 2017 +0200
----------------------------------------------------------------------
.../org/apache/wicket/pageStore/AsynchronousDataStore.java | 4 ++--
.../main/java/org/apache/wicket/pageStore/DiskDataStore.java | 8 ++------
2 files changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/daecdc6c/wicket-core/src/main/java/org/apache/wicket/pageStore/AsynchronousDataStore.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/pageStore/AsynchronousDataStore.java b/wicket-core/src/main/java/org/apache/wicket/pageStore/AsynchronousDataStore.java
index e98eb64..9ae8c9d 100644
--- a/wicket-core/src/main/java/org/apache/wicket/pageStore/AsynchronousDataStore.java
+++ b/wicket-core/src/main/java/org/apache/wicket/pageStore/AsynchronousDataStore.java
@@ -88,8 +88,8 @@ public class AsynchronousDataStore implements IDataStore
public AsynchronousDataStore(final IDataStore dataStore, final int capacity)
{
this.dataStore = dataStore;
- entries = new LinkedBlockingQueue<Entry>(capacity);
- entryMap = new ConcurrentHashMap<String, Entry>();
+ entries = new LinkedBlockingQueue<>(capacity);
+ entryMap = new ConcurrentHashMap<>();
PageSavingRunnable savingRunnable = new PageSavingRunnable(dataStore, entries, entryMap);
pageSavingThread = new Thread(savingRunnable, "Wicket-PageSavingThread");
http://git-wip-us.apache.org/repos/asf/wicket/blob/daecdc6c/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)