From 87c04bf00b1ba04a2e833be979a2a196f57fd49e Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 10 Mar 2012 21:51:50 +0000
Subject: [PATCH] * configloggging: Fix clearing log overrides
---
.../java/src/net/i2p/router/web/ConfigLoggingHandler.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHandler.java
index 772e9879f8..f1970e0447 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHandler.java
@@ -70,7 +70,7 @@ public class ConfigLoggingHandler extends FormHandler {
private void saveChanges() {
boolean shouldSave = false;
- if (_levels != null || _newLogClass != null) {
+ if ((_levels != null && _levels.length() > 0) || _newLogClass != null) {
try {
Properties props = new Properties();
if (_levels != null)
@@ -85,8 +85,9 @@ public class ConfigLoggingHandler extends FormHandler {
_context.logManager().getLog(ConfigLoggingHandler.class).error("Error reading from the props?", ioe);
addFormError("Error updating the log limits - levels not valid");
}
- } else {
+ } else if (!_context.logManager().getLimits().isEmpty()) {
_context.logManager().setLimits(null);
+ shouldSave = true;
addFormNotice("Log limits cleared");
}
--
GitLab