From 6fede7cf7353752428e19a4b403972a8d4e9271c Mon Sep 17 00:00:00 2001
From: Ryan O'Neill <roneill@twitter.com>
Date: Fri, 14 Aug 2015 12:24:12 -0700
Subject: [PATCH] per review

---
 .../java/com/typesafe/config/impl/ConfigConditional.java | 2 +-
 .../com/typesafe/config/impl/ConfigNodeConditional.java  | 9 ---------
 .../main/java/com/typesafe/config/impl/ConfigParser.java | 2 +-
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/config/src/main/java/com/typesafe/config/impl/ConfigConditional.java b/config/src/main/java/com/typesafe/config/impl/ConfigConditional.java
index d53b1bd9..56a0a390 100644
--- a/config/src/main/java/com/typesafe/config/impl/ConfigConditional.java
+++ b/config/src/main/java/com/typesafe/config/impl/ConfigConditional.java
@@ -16,7 +16,7 @@ public class ConfigConditional {
         this.body = body;
 
         if (this.left.optional()) {
-            throw new ConfigException.BugOrBroken("Substitutions in conditional expressions cannot be optional");
+            throw new ConfigException.BugOrBroken("Substitution " + this.left.toString() + " in conditional expression cannot be optional");
         }
     }
 
diff --git a/config/src/main/java/com/typesafe/config/impl/ConfigNodeConditional.java b/config/src/main/java/com/typesafe/config/impl/ConfigNodeConditional.java
index c027caeb..ad95bb4a 100644
--- a/config/src/main/java/com/typesafe/config/impl/ConfigNodeConditional.java
+++ b/config/src/main/java/com/typesafe/config/impl/ConfigNodeConditional.java
@@ -28,14 +28,5 @@ final class ConfigNodeConditional extends AbstractConfigNode {
         }
         return tokens;
     }
-//
-//    protected String name() {
-//        for (AbstractConfigNode n : children) {
-//            if (n instanceof ConfigNodeSimpleValue) {
-//                return (String)Tokens.getValue(((ConfigNodeSimpleValue) n).token()).unwrapped();
-//            }
-//        }
-//        return null;
-//    }
 }
 
diff --git a/config/src/main/java/com/typesafe/config/impl/ConfigParser.java b/config/src/main/java/com/typesafe/config/impl/ConfigParser.java
index d63bc5ee..9beafc06 100644
--- a/config/src/main/java/com/typesafe/config/impl/ConfigParser.java
+++ b/config/src/main/java/com/typesafe/config/impl/ConfigParser.java
@@ -94,7 +94,7 @@ final class ConfigParser {
             } else if (n instanceof ConfigNodeObject) {
                 v = parseObject((ConfigNodeObject)n);
             } else if (n instanceof ConfigNodeArray) {
-                v = parseArray((ConfigNodeArray) n);
+                v = parseArray((ConfigNodeArray)n);
             } else if (n instanceof ConfigNodeConcatenation) {
                 v = parseConcatenation((ConfigNodeConcatenation)n);
             } else {