From 45347a60645625d6634767d1b63753de416d215c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 09 May 2014 08:06:24 -0400
Subject: [PATCH] Merge branch 'ticket/69' into develop
---
src/main/java/com/gitblit/models/ServerStatus.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/gitblit/models/ServerStatus.java b/src/main/java/com/gitblit/models/ServerStatus.java
index 3a1e030..bb6396b 100644
--- a/src/main/java/com/gitblit/models/ServerStatus.java
+++ b/src/main/java/com/gitblit/models/ServerStatus.java
@@ -25,9 +25,9 @@
/**
* ServerStatus encapsulates runtime status information about the server
* including some information about the system environment.
- *
+ *
* @author James Moger
- *
+ *
*/
public class ServerStatus implements Serializable {
@@ -39,8 +39,6 @@
public final String releaseDate;
- public final boolean isGO;
-
public final Map<String, String> systemProperties;
public final long heapMaximum;
@@ -49,13 +47,14 @@
public volatile long heapFree;
+ public boolean isGO;
+
public String servletContainer;
- public ServerStatus(boolean isGO) {
+ public ServerStatus() {
this.bootDate = new Date();
this.version = Constants.getVersion();
this.releaseDate = Constants.getBuildDate();
- this.isGO = isGO;
this.heapMaximum = Runtime.getRuntime().maxMemory();
--
Gitblit v1.9.1