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 2015/06/20 16:07:43 UTC

[1/9] wicket git commit: Remove a check for 'page == null'. Component#getPage() already throws an exception in this case.

Repository: wicket
Updated Branches:
  refs/heads/master e8cb8efa5 -> 0b6a46f77


Remove a check for 'page == null'. Component#getPage() already throws an exception in this case.


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

Branch: refs/heads/master
Commit: 869ea87d405244af5ed2ac7376c4bde77bcbd81d
Parents: e8cb8ef
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sat Jun 20 16:05:09 2015 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sat Jun 20 16:05:09 2015 +0300

----------------------------------------------------------------------
 .../main/java/org/apache/wicket/markup/html/MarkupUtil.java    | 6 ------
 1 file changed, 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/869ea87d/wicket-core/src/main/java/org/apache/wicket/markup/html/MarkupUtil.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/MarkupUtil.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/MarkupUtil.java
index 587fd13..3de879c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/MarkupUtil.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/MarkupUtil.java
@@ -46,12 +46,6 @@ public class MarkupUtil
 		Args.notNull(container, "container");
 
 		Page page = container.getPage();
-		if (page == null)
-		{
-			throw new WicketRuntimeException("Component not attached to Page. Component: " +
-				container.toString());
-		}
-
 
 		final boolean rtn[] = new boolean[] { true };
 		page.visitChildren(MarkupContainer.class, new IVisitor<MarkupContainer, Void>()


[2/9] wicket git commit: FindBugs: Check for non-null result from file related operations before using the result

Posted by mg...@apache.org.
FindBugs: Check for non-null result from file related operations before using the result


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

Branch: refs/heads/master
Commit: 13ae30a42b4ac77436333105877fef93c8bd0a28
Parents: 869ea87
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sat Jun 20 16:07:51 2015 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sat Jun 20 16:07:51 2015 +0300

----------------------------------------------------------------------
 .../apache/wicket/pageStore/DiskDataStore.java  |  4 +--
 .../protocol/http/mock/MockServletContext.java  | 30 ++++++++++++--------
 2 files changed, 20 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/13ae30a4/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 887fc09..83be97d 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
@@ -486,12 +486,12 @@ public class DiskDataStore implements IDataStore
 		private void cleanup(final File sessionFolder)
 		{
 			File high = sessionFolder.getParentFile();
-			if (high.list().length == 0)
+			if (high != null && high.list().length == 0)
 			{
 				if (Files.removeFolder(high))
 				{
 					File low = high.getParentFile();
-					if (low.list().length == 0)
+					if (low != null && low.list().length == 0)
 					{
 						Files.removeFolder(low);
 					}

http://git-wip-us.apache.org/repos/asf/wicket/blob/13ae30a4/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockServletContext.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockServletContext.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockServletContext.java
index c3982cb..c9304e9 100755
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockServletContext.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockServletContext.java
@@ -475,13 +475,16 @@ public class MockServletContext implements ServletContext
 		{
 			File[] files = current.listFiles();
 			boolean match = false;
-			for (File file : files)
+			if (files != null)
 			{
-				if (file.getName().equals(element) && file.isDirectory())
+				for (File file : files)
 				{
-					current = file;
-					match = true;
-					break;
+					if (file.getName().equals(element) && file.isDirectory())
+					{
+						current = file;
+						match = true;
+						break;
+					}
 				}
 			}
 			if (!match)
@@ -491,16 +494,19 @@ public class MockServletContext implements ServletContext
 		}
 
 		File[] files = current.listFiles();
-		Set<String> result = new HashSet<String>();
-		int stripLength = webappRoot.getPath().length();
-		for (File file : files)
+		Set<String> result = new HashSet<>();
+		if (files != null)
 		{
-			String s = file.getPath().substring(stripLength).replace('\\', '/');
-			if (file.isDirectory())
+			int stripLength = webappRoot.getPath().length();
+			for (File file : files)
 			{
-				s = s + "/";
+				String s = file.getPath().substring(stripLength).replace('\\', '/');
+				if (file.isDirectory())
+				{
+					s = s + "/";
+				}
+				result.add(s);
 			}
-			result.add(s);
 		}
 		return result;
 	}


[8/9] wicket git commit: FindBugs: Check for Integer.MIN_VALUE before trying to get its absolute value.

Posted by mg...@apache.org.
FindBugs: Check for Integer.MIN_VALUE before trying to get its absolute value.


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

Branch: refs/heads/master
Commit: a0ef6afe0e021e849dfa0f3a764e813a71540c8a
Parents: 5f9f47d
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sat Jun 20 16:40:46 2015 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sat Jun 20 16:40:46 2015 +0300

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


http://git-wip-us.apache.org/repos/asf/wicket/blob/a0ef6afe/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 83be97d..c91890c 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
@@ -567,7 +567,12 @@ public class DiskDataStore implements IDataStore
 	 */
 	private String createPathFrom(final String sessionId)
 	{
-		int hash = Math.abs(sessionId.hashCode());
+		int sessionIdHashCode = sessionId.hashCode();
+		if (sessionIdHashCode == Integer.MIN_VALUE) {
+			// Math.abs(MIN_VALUE) == MIN_VALUE, so avoid it
+			sessionIdHashCode += 1;
+		}
+		int hash = Math.abs(sessionIdHashCode);
 		String low = String.valueOf(hash % 9973);
 		String high = String.valueOf((hash / 9973) % 9973);
 		StringBuilder bs = new StringBuilder(sessionId.length() + 10);


[9/9] wicket git commit: FindBugs: Use a special lock object for requestWindow because in #resizeBuffer() requestWindow needs to be re-assigned and locking on its old instance is wrong.

Posted by mg...@apache.org.
FindBugs: Use a special lock object for requestWindow because in #resizeBuffer() requestWindow needs to be re-assigned and locking on its old instance is wrong.


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

Branch: refs/heads/master
Commit: 0b6a46f7777a2058e5d1769a9fe356c088e1638d
Parents: a0ef6af
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sat Jun 20 17:03:22 2015 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sat Jun 20 17:03:22 2015 +0300

----------------------------------------------------------------------
 .../protocol/http/AbstractRequestLogger.java    | 32 +++++++++++---------
 1 file changed, 18 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/0b6a46f7/wicket-core/src/main/java/org/apache/wicket/protocol/http/AbstractRequestLogger.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/AbstractRequestLogger.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/AbstractRequestLogger.java
index ce83ab3..0c5d7d0 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/AbstractRequestLogger.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/AbstractRequestLogger.java
@@ -85,6 +85,13 @@ public abstract class AbstractRequestLogger implements IRequestLogger
 	private RequestData[] requestWindow;
 
 	/**
+	 * A special object used as a lock before accessing {@linkplain #requestWindow}.
+	 * Needed because {@linkplain #requestWindow} is being reassigned in some cases,
+	 * e.g. {@link #resizeBuffer()}
+	 */
+	private final Object requestWindowLock = new Object();
+
+	/**
 	 * Cursor pointing to the current writable location in the buffer. Points to the first empty
 	 * slot or if the buffer has been filled completely to the oldest request in the buffer.
 	 */
@@ -109,7 +116,7 @@ public abstract class AbstractRequestLogger implements IRequestLogger
 	{
 		int requestsWindowSize = getRequestsWindowSize();
 		requestWindow = new RequestData[requestsWindowSize];
-		liveSessions = new ConcurrentHashMap<String, SessionData>();
+		liveSessions = new ConcurrentHashMap<>();
 	}
 
 	@Override
@@ -142,7 +149,7 @@ public abstract class AbstractRequestLogger implements IRequestLogger
 	@Override
 	public List<RequestData> getRequests()
 	{
-		synchronized (requestWindow)
+		synchronized (requestWindowLock)
 		{
 			RequestData[] result = new RequestData[hasBufferRolledOver() ? requestWindow.length
 				: indexInWindow];
@@ -242,7 +249,7 @@ public abstract class AbstractRequestLogger implements IRequestLogger
 
 			addRequest(requestdata);
 
-			SessionData sessiondata = null;
+			SessionData sessiondata;
 			if (sessionId != null)
 			{
 				sessiondata = liveSessions.get(sessionId);
@@ -335,7 +342,7 @@ public abstract class AbstractRequestLogger implements IRequestLogger
 		// ensure the buffer has the proper installed length
 		resizeBuffer();
 
-		synchronized (requestWindow)
+		synchronized (requestWindowLock)
 		{
 			// if the requestWindow is a zero-length array, nothing gets stored
 			if (requestWindow.length == 0)
@@ -366,19 +373,16 @@ public abstract class AbstractRequestLogger implements IRequestLogger
 
 	private int getWindowSize()
 	{
-		synchronized (requestWindow)
-		{
-			if (requestWindow[requestWindow.length - 1] == null)
-				return indexInWindow;
-			else
-				return requestWindow.length;
-		}
+		if (requestWindow[requestWindow.length - 1] == null)
+			return indexInWindow;
+		else
+			return requestWindow.length;
 	}
 
 	@Override
 	public long getAverageRequestTime()
 	{
-		synchronized (requestWindow)
+		synchronized (requestWindowLock)
 		{
 			int windowSize = getWindowSize();
 			if (windowSize == 0)
@@ -390,7 +394,7 @@ public abstract class AbstractRequestLogger implements IRequestLogger
 	@Override
 	public long getRequestsPerMinute()
 	{
-		synchronized (requestWindow)
+		synchronized (requestWindowLock)
 		{
 			int windowSize = getWindowSize();
 			if (windowSize == 0)
@@ -439,7 +443,7 @@ public abstract class AbstractRequestLogger implements IRequestLogger
 			return;
 
 		RequestData[] newRequestWindow = new RequestData[newCapacity];
-		synchronized (requestWindow)
+		synchronized (requestWindowLock)
 		{
 			int oldCapacity = requestWindow.length;
 			int oldNumberOfElements = hasBufferRolledOver() ? oldCapacity : indexInWindow;


[3/9] wicket git commit: FindBugs: Do not check 'scheduled' for null, it is knows that it is null at that point.

Posted by mg...@apache.org.
FindBugs: Do not check 'scheduled' for null, it is knows that it is null at that point.


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

Branch: refs/heads/master
Commit: a370cf389a765f7bbaa6ba57d441afdc297d7592
Parents: 13ae30a
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sat Jun 20 16:09:26 2015 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sat Jun 20 16:09:26 2015 +0300

----------------------------------------------------------------------
 .../org/apache/wicket/request/handler/render/WebPageRenderer.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/a370cf38/wicket-core/src/main/java/org/apache/wicket/request/handler/render/WebPageRenderer.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/handler/render/WebPageRenderer.java b/wicket-core/src/main/java/org/apache/wicket/request/handler/render/WebPageRenderer.java
index 00a8ea2..a59e585 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/handler/render/WebPageRenderer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/handler/render/WebPageRenderer.java
@@ -123,7 +123,7 @@ public class WebPageRenderer extends PageRenderer
 			requestCycle.setResponse(response);
 			requestablePage.renderPage();
 
-			if (scheduled == null && requestCycle.getRequestHandlerScheduledAfterCurrent() != null)
+			if (requestCycle.getRequestHandlerScheduledAfterCurrent() != null)
 			{
 				// This is a special case.
 				// During page render another request handler got scheduled and will want to


[4/9] wicket git commit: FindBugs: Use the new Long#compare(long, long) instead of boxing them before comparing.

Posted by mg...@apache.org.
FindBugs: Use the new Long#compare(long, long) instead of boxing them before comparing.


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

Branch: refs/heads/master
Commit: 431f24e782b021fa959eda2c7d949e863d774651
Parents: a370cf3
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sat Jun 20 16:15:53 2015 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sat Jun 20 16:15:53 2015 +0300

----------------------------------------------------------------------
 .../main/java/org/apache/wicket/pageStore/PerSessionPageStore.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/431f24e7/wicket-core/src/main/java/org/apache/wicket/pageStore/PerSessionPageStore.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/pageStore/PerSessionPageStore.java b/wicket-core/src/main/java/org/apache/wicket/pageStore/PerSessionPageStore.java
index fdfe92d..912171c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/pageStore/PerSessionPageStore.java
+++ b/wicket-core/src/main/java/org/apache/wicket/pageStore/PerSessionPageStore.java
@@ -139,7 +139,7 @@ public class PerSessionPageStore extends AbstractCachingPageStore<IManageablePag
 			@Override
 			public int compare(PageValue p1, PageValue p2)
 			{
-				return Long.valueOf(p1.accessTime).compareTo(p2.accessTime);
+				return Long.compare(p1.accessTime, p2.accessTime);
 			}
 		}
 


[6/9] wicket git commit: FindBugs: Use more optimal iteration over the entry set instead of over the key set + lookup by key

Posted by mg...@apache.org.
FindBugs: Use more optimal iteration over the entry set instead of over the key set + lookup by key


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

Branch: refs/heads/master
Commit: 003d1c3e7b3af03ab43e58231ab2d40fe5425283
Parents: ae3b2d6
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sat Jun 20 16:19:49 2015 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sat Jun 20 16:19:49 2015 +0300

----------------------------------------------------------------------
 .../wicket/protocol/http/mock/MockHttpServletRequest.java       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/003d1c3e/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java
index 5acc2a5..354d1c0 100755
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java
@@ -1680,9 +1680,10 @@ public class MockHttpServletRequest implements HttpServletRequest
 			// Add files
 			if (uploadedFiles != null)
 			{
-				for (String fieldName : uploadedFiles.keySet())
+				for (Map.Entry<String, List<UploadedFile>> entry : uploadedFiles.entrySet())
 				{
-					List<UploadedFile> files = uploadedFiles.get(fieldName);
+					String fieldName = entry.getKey();
+					List<UploadedFile> files = entry.getValue();
 
 					for (UploadedFile uf : files)
 					{


[5/9] wicket git commit: FindBugs: just widen from int to long, instead of widen+box+unbox

Posted by mg...@apache.org.
FindBugs: just widen from int to long, instead of widen+box+unbox


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

Branch: refs/heads/master
Commit: ae3b2d60febcf83c6e8daa08578de7b141d6cdbb
Parents: 431f24e
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sat Jun 20 16:18:25 2015 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sat Jun 20 16:18:25 2015 +0300

----------------------------------------------------------------------
 .../java/org/apache/wicket/request/resource/PackageResource.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/ae3b2d60/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java
index 995e2db..c5ade25 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java
@@ -341,7 +341,7 @@ public class PackageResource extends AbstractResource implements IStaticCacheabl
 				if (readBuffered)
 				{
 					bytes = IOUtils.toByteArray(inputStream);
-					resourceResponse.setContentLength(new Long(bytes.length));
+					resourceResponse.setContentLength(bytes.length);
 				}
 				else
 				{


[7/9] wicket git commit: FindBugs: remove 'synchronized' to #setPageManagerProvider()

Posted by mg...@apache.org.
FindBugs: remove 'synchronized' to #setPageManagerProvider()

The getter is not synchronized. All other **Provider() methods are also not synchronized.
Usually these methods are called in Application#init() where there is no concurrency.


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

Branch: refs/heads/master
Commit: 5f9f47d88bc0a0ec5eb8a8b10c74ba428e06d484
Parents: 003d1c3
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sat Jun 20 16:33:58 2015 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sat Jun 20 16:33:58 2015 +0300

----------------------------------------------------------------------
 wicket-core/src/main/java/org/apache/wicket/Application.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/5f9f47d8/wicket-core/src/main/java/org/apache/wicket/Application.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Application.java b/wicket-core/src/main/java/org/apache/wicket/Application.java
index 056d4ae..f6c3f33 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Application.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Application.java
@@ -1485,7 +1485,7 @@ public abstract class Application implements UnboundListener, IEventSink
 	 * 
 	 * @param provider
 	 */
-	public synchronized final Application setPageManagerProvider(final IPageManagerProvider provider)
+	public final Application setPageManagerProvider(final IPageManagerProvider provider)
 	{
 		pageManagerProvider = provider;
 		return this;