Update of /var/cvs/src/org/mmbase/core/util
In directory james.mmbase.org:/tmp/cvs-serv28895
Modified Files:
SystemProperties.java
Log Message:
added @since, @author, changed that unset properties return null, not empty
string (getSettingValue depended on that to return the 'default' value
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/core/util
Index: SystemProperties.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/core/util/SystemProperties.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- SystemProperties.java 11 Apr 2008 15:04:31 -0000 1.1
+++ SystemProperties.java 4 Aug 2008 17:15:45 -0000 1.2
@@ -16,11 +16,12 @@
* This class facilitates the use of nodes for system properties.
* The special property "mmservers" is used to switch between environments.
* This class will search for the mmbaseroot machinename in the value of the
"mmservers" property
+ * @since MMBase-1.9
+ * @author Nico Klasens
*/
public class SystemProperties {
- /** MMbase logging system */
- private static Logger log =
Logging.getLoggerInstance(SystemProperties.class.getName());
+ private static final Logger log =
Logging.getLoggerInstance(SystemProperties.class);
private final static String PROPERTY_BUILDER = "systemproperties";
@@ -257,7 +258,7 @@
}
private static String readProperty(String key, MMObjectNode property) {
- String result = "";
+ String result = null;
if (property != null) {
result = property.getStringValue(environment);
if (!DEFAULT.equals(environment) && (result == null ||
"".equals(result))) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
