From 9c47959ece677eaaceb6f3d2eb42b0466f60acdc Mon Sep 17 00:00:00 2001
From: Markus Fömpe <markus.foempe@gmail.com>
Date: Fri, 04 Jan 2013 06:03:09 -0500
Subject: [PATCH] Removed DoubleCheckedLocking from checkstyle.xml. Since Checkstyle 5.6 it's no longer supported (see http://checkstyle.sourceforge.net/releasenotes.html)
---
src/com/gitblit/wicket/AuthorizationStrategy.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/com/gitblit/wicket/AuthorizationStrategy.java b/src/com/gitblit/wicket/AuthorizationStrategy.java
index 452215a..21bd1b7 100644
--- a/src/com/gitblit/wicket/AuthorizationStrategy.java
+++ b/src/com/gitblit/wicket/AuthorizationStrategy.java
@@ -16,7 +16,7 @@
package com.gitblit.wicket;
import org.apache.wicket.Component;
-import org.apache.wicket.RestartResponseAtInterceptPageException;
+import org.apache.wicket.RestartResponseException;
import org.apache.wicket.authorization.IUnauthorizedComponentInstantiationListener;
import org.apache.wicket.authorization.strategies.page.AbstractPageAuthorizationStrategy;
@@ -49,6 +49,7 @@
GitBlitWebSession session = GitBlitWebSession.get();
if (authenticateView && !session.isLoggedIn()) {
// authentication required
+ session.cacheRequest(pageClass);
return false;
}
@@ -59,7 +60,7 @@
if (authenticateAdmin) {
// authenticate admin
if (user != null) {
- return user.canAdmin;
+ return user.canAdmin();
}
return false;
} else {
@@ -78,7 +79,7 @@
@Override
public void onUnauthorizedInstantiation(Component component) {
if (component instanceof BasePage) {
- throw new RestartResponseAtInterceptPageException(RepositoriesPage.class);
+ throw new RestartResponseException(RepositoriesPage.class);
}
}
}
--
Gitblit v1.9.1