From f3ff376a5eb945f15329b66bbb7d69ed3ca2ce3f Mon Sep 17 00:00:00 2001 From: James Moger Date: Fri, 3 Aug 2012 20:39:50 -0400 Subject: Confirmed fix for GO settings manipulation (issue 85) --- docs/04_releases.mkd | 1 + src/com/gitblit/FileSettings.java | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd index 335507fb..b2a373c9 100644 --- a/docs/04_releases.mkd +++ b/docs/04_releases.mkd @@ -16,6 +16,7 @@ If you are updating from an earlier release AND you have indexed branches with t - Output real RAW content, not simulated RAW content (issue 114) - Fixed Lucene charset encoding bug when reindexing a repository (issue 112) - Fixed null pointer in LdapUserSerivce if account has a null email address (issue 110) +- Really fixed failure to update a GO setting from the manager (issue 85) #### additions diff --git a/src/com/gitblit/FileSettings.java b/src/com/gitblit/FileSettings.java index 666bda05..be1f44f2 100644 --- a/src/com/gitblit/FileSettings.java +++ b/src/com/gitblit/FileSettings.java @@ -87,8 +87,14 @@ public class FileSettings extends IStoredSettings { String content = FileUtils.readContent(propertiesFile, "\n"); for (Map.Entry setting:settings.entrySet()) { String regex = "(?m)^(" + regExEscape(setting.getKey()) + "\\s*+=\\s*+)" - + "(?:[^\r\n\\\\]++|\\\\(?:\r?\n|\r|.))*+$"; + + "(?:[^\r\n\\\\]++|\\\\(?:\r?\n|\r|.))*+$"; + String oldContent = content; content = content.replaceAll(regex, setting.getKey() + " = " + setting.getValue()); + if (content.equals(oldContent)) { + // did not replace value because it does not exist in the file + // append new setting to content (issue-85) + content += "\n" + setting.getKey() + " = " + setting.getValue(); + } } FileUtils.writeContent(propertiesFile, content); // manually set the forceReload flag because not all JVMs support real -- cgit v1.2.3