[Rails-commits] Branch 'rails1.7.x' - data/profiles rails/common

[Stefan F. <ste...@us...>]

 data/profiles/ORDocking.predefined |    2 ++
 data/profiles/prettyUI.predefined  |    2 ++
 rails/common/ConfigProfile.java    |    3 ++-
 3 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 8f6de4968fea3b5268a0324a9ddbf2c6ea8819a5
Author: Stefan Frey <ste...@we...>
Date:   Tue Apr 3 17:00:04 2012 +0200

    avoid runtime error due to missing parent defintions

diff --git a/data/profiles/ORDocking.predefined b/data/profiles/ORDocking.predefined
index aa4985d..19c00d9 100644
--- a/data/profiles/ORDocking.predefined
+++ b/data/profiles/ORDocking.predefined
@@ -1,5 +1,7 @@
 ### ORDocking profile
 ### activates the docking framework
 or.window.dockablePanels=yes
+### parent
+profile.parent=pbem
 ### cannot be derived
 profile.final=yes
diff --git a/data/profiles/prettyUI.predefined b/data/profiles/prettyUI.predefined
index f2e51b3..cfcf6f3 100644
--- a/data/profiles/prettyUI.predefined
+++ b/data/profiles/prettyUI.predefined
@@ -7,5 +7,7 @@ gridPanel.tableBorders=enabled
 map.image.display=yes
 map.displayCurrentRoutes=yes
 map.highlightHexes=yes
+### parent
+profile.parent=pbem
 ### cannot be derived
 profile.final=yes
diff --git a/rails/common/ConfigProfile.java b/rails/common/ConfigProfile.java
index 1ee6876..3b9d101 100644
--- a/rails/common/ConfigProfile.java
+++ b/rails/common/ConfigProfile.java
@@ -179,7 +179,7 @@ public final class ConfigProfile implements Comparable<ConfigProfile> {
     
     String getProperty(String key) {
         ensureLoad();
-        if (this == root || properties.containsKey(key)) {
+        if (this == parent || properties.containsKey(key)) {
             return properties.getProperty(key);
         } else {
             return parent.getProperty(key);
@@ -254,6 +254,7 @@ public final class ConfigProfile implements Comparable<ConfigProfile> {
         if (Util.hasValue(properties.getProperty(PARENT_KEY))) {
             setParent(properties.getProperty(PARENT_KEY));
         }
+        
         if (parent == null) {
             setParent(root);
         }