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/models/ServerStatus.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/src/com/gitblit/models/ServerStatus.java b/src/com/gitblit/models/ServerStatus.java
index 8dfc0fb..3e7e8d8 100644
--- a/src/com/gitblit/models/ServerStatus.java
+++ b/src/com/gitblit/models/ServerStatus.java
@@ -20,6 +20,8 @@
import java.util.Map;
import java.util.TreeMap;
+import com.gitblit.Constants;
+
/**
* ServerStatus encapsulates runtime status information about the server
* including some information about the system environment.
@@ -32,21 +34,32 @@
private static final long serialVersionUID = 1L;
public final Date bootDate;
-
+
+ public final String version;
+
+ public final String releaseDate;
+
+ public final boolean isGO;
+
public final Map<String, String> systemProperties;
- public final long heapSize;
+ public final long heapMaximum;
public volatile long heapAllocated;
-
+
public volatile long heapFree;
- public ServerStatus() {
- bootDate = new Date();
-
- heapSize = Runtime.getRuntime().maxMemory();
-
- systemProperties = new TreeMap<String, String>();
+ public String servletContainer;
+
+ public ServerStatus(boolean isGO) {
+ this.bootDate = new Date();
+ this.version = Constants.VERSION;
+ this.releaseDate = Constants.VERSION_DATE;
+ this.isGO = isGO;
+
+ this.heapMaximum = Runtime.getRuntime().maxMemory();
+
+ this.systemProperties = new TreeMap<String, String>();
put("file.encoding");
put("java.home");
put("java.io.tmpdir");
--
Gitblit v1.9.1