From db8d09625a1a6be774d1f7532d49551d72cf941d Mon Sep 17 00:00:00 2001
From: zeroleak <zeroleak@samourai.io>
Date: Mon, 9 Mar 2020 14:24:30 +0100
Subject: [PATCH] cleanup

---
 .../samourai/javaserver/web/models/ConfigTemplateModel.java | 5 -----
 src/main/resources/templates/decorators/system.html         | 6 ++++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/samourai/javaserver/web/models/ConfigTemplateModel.java b/src/main/java/com/samourai/javaserver/web/models/ConfigTemplateModel.java
index b8940eb..b206875 100644
--- a/src/main/java/com/samourai/javaserver/web/models/ConfigTemplateModel.java
+++ b/src/main/java/com/samourai/javaserver/web/models/ConfigTemplateModel.java
@@ -1,14 +1,10 @@
 package com.samourai.javaserver.web.models;
 
-import com.samourai.javaserver.utils.ServerUtils;
 import java.util.Map;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.web.ServerProperties;
 import org.springframework.ui.Model;
 
 public class ConfigTemplateModel extends DashboardTemplateModel {
   public Map<String, String> configInfo;
-  @Autowired protected ServerProperties serverProperties;
 
   public ConfigTemplateModel(String pageTitle, String logoTitle, Map<String, String> configInfo) {
     super(pageTitle, logoTitle);
@@ -17,7 +13,6 @@ public ConfigTemplateModel(String pageTitle, String logoTitle, Map<String, Strin
 
   public void apply(Model model) {
     super.apply(model);
-    configInfo.put("serverProperties", ServerUtils.getInstance().toJsonString(serverProperties));
     model.addAttribute("configModel", this);
   }
 }
diff --git a/src/main/resources/templates/decorators/system.html b/src/main/resources/templates/decorators/system.html
index b72a6d5..6a4b4e4 100644
--- a/src/main/resources/templates/decorators/system.html
+++ b/src/main/resources/templates/decorators/system.html
@@ -35,8 +35,10 @@ <h1 class="h2">System</h1>
                     <td class="threadName"><span th:text="${thread.getName()}"/></td>
                     <td class="threadState"><span th:text="${thread.getState()}"/></td>
                     <td class="threadStacktrace">
-                        <div th:each="line : ${thread.getStackTrace()}">
-                            <div th:text="${line.toString()}"/>
+                        <div th:if="${thread.getState().name() == 'BLOCKED'}">
+                            <div th:each="line : ${thread.getStackTrace()}">
+                                <span th:text="${line.toString()}"/>
+                            </div>
                         </div>
                     </td>
                 </tr>