From 86bea9e0016b2890db8ba83049dd4e89653a0a5e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 16 Mar 2012 17:29:39 -0400
Subject: [PATCH] Ensure that the welcome message is interpreted as UTF-8 (issue 74)
---
src/com/gitblit/wicket/GitBlitWebSession.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/com/gitblit/wicket/GitBlitWebSession.java b/src/com/gitblit/wicket/GitBlitWebSession.java
index d39a25d..2238660 100644
--- a/src/com/gitblit/wicket/GitBlitWebSession.java
+++ b/src/com/gitblit/wicket/GitBlitWebSession.java
@@ -22,17 +22,17 @@
import org.apache.wicket.protocol.http.WebSession;
import org.apache.wicket.protocol.http.request.WebClientInfo;
-import com.gitblit.wicket.models.UserModel;
+import com.gitblit.models.UserModel;
public final class GitBlitWebSession extends WebSession {
private static final long serialVersionUID = 1L;
- protected TimeZone timezone = null;
+ protected TimeZone timezone;
- private UserModel user = null;
-
- private String errorMessage = null;
+ private UserModel user;
+
+ private String errorMessage;
public GitBlitWebSession(Request request) {
super(request);
@@ -51,7 +51,7 @@
if (user == null) {
return false;
}
- return user.canAdmin();
+ return user.canAdmin;
}
public UserModel getUser() {
@@ -72,11 +72,11 @@
}
return timezone;
}
-
+
public void cacheErrorMessage(String message) {
this.errorMessage = message;
}
-
+
public String clearErrorMessage() {
String msg = errorMessage;
errorMessage = null;
--
Gitblit v1.9.1