[#306] Use a custom implementation of Properties for Play.configurati…

…on, that guarantee the iteration order.
playframework · Oct 19, 2010 · 66fcced · 66fcced
1 parent 83154ad
commit 66fcced
Show file tree

Hide file tree

Showing 3 changed files with 529 additions and 5 deletions.
diff --git a/framework/src/play/Play.java b/framework/src/play/Play.java
@@ -12,6 +12,7 @@
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -26,6 +27,7 @@
 import play.libs.IO;
 import play.mvc.Router;
 import play.templates.TemplateLoader;
+import play.utils.OrderSafeProperties;
 import play.vfs.VirtualFile;
 
 /**
@@ -287,15 +289,15 @@ static void readConfiguration() {
         VirtualFile appRoot = VirtualFile.open(applicationPath);
         conf = appRoot.child("conf/application.conf");
         try {
-            configuration = IO.readUtf8Properties(conf.inputstream());
+            configuration = IO.readUtf8Properties(conf.inputstream());        
         } catch (RuntimeException e) {
             if (e.getCause() instanceof IOException) {
                 Logger.fatal("Cannot read application.conf");
                 System.exit(0);
             }
         }
         // Ok, check for instance specifics configuration
-        Properties newConfiguration = new Properties();
+        Properties newConfiguration = new OrderSafeProperties();
         Pattern pattern = Pattern.compile("^%([a-zA-Z0-9_\\-]+)\\.(.*)$");
         for (Object key : configuration.keySet()) {
             Matcher matcher = pattern.matcher(key + "");
@@ -618,8 +620,8 @@ public static void loadModules() {
                 }
             }
         }
-        for (Enumeration<?> e = configuration.propertyNames(); e.hasMoreElements();) {
-            String pName = e.nextElement().toString();
+        for (Iterator<?> e = configuration.keySet().iterator(); e.hasNext();) {
+            String pName = e.next().toString();
             if (pName.startsWith("module.")) {
                 String moduleName = pName.substring(7);
                 File modulePath = new File(configuration.getProperty(pName));

diff --git a/framework/src/play/libs/IO.java b/framework/src/play/libs/IO.java
@@ -17,6 +17,7 @@
 
 import org.apache.commons.io.IOUtils;
 import play.exceptions.UnexpectedException;
+import play.utils.OrderSafeProperties;
 
 /**
  * IO utils
@@ -29,7 +30,7 @@ public class IO {
      * @return The Properties object
      */
     public static Properties readUtf8Properties(InputStream is) {
-        Properties properties = new Properties();
+        Properties properties = new OrderSafeProperties();
         try {
             properties.load(is);
             for (Object key : properties.keySet()) {