[Swift-commit] r7995 - trunk/src/org/griphyn/vdl/util

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2014-07-12 01:25:32 -0500 (Sat, 12 Jul 2014)
New Revision: 7995

Modified:
   trunk/src/org/griphyn/vdl/util/SwiftConfigSchema.java
Log:
fixed missing property check

Modified: trunk/src/org/griphyn/vdl/util/SwiftConfigSchema.java
===================================================================
--- trunk/src/org/griphyn/vdl/util/SwiftConfigSchema.java	2014-07-12 04:38:16 UTC (rev 7994)
+++ trunk/src/org/griphyn/vdl/util/SwiftConfigSchema.java	2014-07-12 06:25:32 UTC (rev 7995)
@@ -231,6 +231,11 @@
     private boolean parentsAreOptional(String k, ConfigTree<Boolean> confTree) {
         while (!k.isEmpty()) {
             k = parent(k);
+            if (k.endsWith(".*")) {
+                // if you got to this point and expansion has been performed,
+                // the parents are not optional any more
+                return false;
+            }
             Info i = info.get(k);
             if (i != null && !i.optional && !confTree.hasKey(k)) {
                 return false;