From c783c65aec25975a67a9b487b6678220b4f8ce9d Mon Sep 17 00:00:00 2001
From: Emil Ivov <emcho@jitsi.org>
Date: Wed, 22 May 2013 12:14:26 +0300
Subject: [PATCH] Makes it possible to override mutability of properties from
the overrides file.
---
.../impl/configuration/ConfigurationServiceImpl.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/org/jitsi/impl/configuration/ConfigurationServiceImpl.java b/src/org/jitsi/impl/configuration/ConfigurationServiceImpl.java
index 67aaf3c9..9ca8a5f0 100644
--- a/src/org/jitsi/impl/configuration/ConfigurationServiceImpl.java
+++ b/src/org/jitsi/impl/configuration/ConfigurationServiceImpl.java
@@ -64,7 +64,7 @@ public class ConfigurationServiceImpl
* for any of the default properties.
*/
private static final String DEFAULT_OVERRIDES_PROPS_FILE_NAME
- = "jitsi-default-overrides.properties";
+ = "jitsi-default-overrides.properties";
/**
* A reference to the currently used configuration file.
@@ -1587,11 +1587,19 @@ private void loadDefaultProperties(String fileName)
//it seems that we have a valid default immutable property
immutableDefaultProperties.put(name, value);
+
+ //in case this is an override, make sure we remove previous
+ //definitions of this property
+ defaultProperties.remove(name);
}
else
{
//this property is a regular, mutable default property.
defaultProperties.put(name, value);
+
+ //in case this is an override, make sure we remove previous
+ //definitions of this property
+ immutableDefaultProperties.remove(name);
}
}
}
--
GitLab