Flexible overloads for PropertyUtils load

justinsb · justinsb · commit 2d7453cb5269 · 2012-08-06T15:59:25.000-07:00
diff --git a/openstack-commons/src/main/java/org/openstack/utils/PropertyUtils.java b/openstack-commons/src/main/java/org/openstack/utils/PropertyUtils.java
@@ -7,19 +7,25 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Properties;
+import java.util.TreeMap;
 
 import com.google.common.base.Splitter;
+import com.google.common.collect.Maps;
 
 public class PropertyUtils {
 	public static Properties loadProperties(File file) throws IOException {
 		Properties properties = new Properties();
+		loadProperties(properties, file);
+		return properties;
+	}
+
+	public static void loadProperties(Properties properties, File file) throws IOException {
 		FileInputStream is = new FileInputStream(file);
 		try {
 			properties.load(is);
 		} finally {
 			Io.safeClose(is);
 		}
-		return properties;
 	}
 
 	public static Properties getChildProperties(Properties base, String prefix) {
