From 274dd4f6b38b5c4722d097d5f1e530a0e6737bff Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Fri, 12 Jul 2013 15:44:32 -0400 Subject: [PATCH] Cosmetic fix to SimpleIncluder.java There was some stuff needlessly outside the block in which it was used. --- .../main/java/com/typesafe/config/impl/SimpleIncluder.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/config/src/main/java/com/typesafe/config/impl/SimpleIncluder.java b/config/src/main/java/com/typesafe/config/impl/SimpleIncluder.java index 4714dc96..2cde2f92 100644 --- a/config/src/main/java/com/typesafe/config/impl/SimpleIncluder.java +++ b/config/src/main/java/com/typesafe/config/impl/SimpleIncluder.java @@ -221,7 +221,6 @@ class SimpleIncluder implements FullIncluder { + "exceptions should have been logged above."); } - String failMessage; if (fails.isEmpty()) { // this should not happen throw new ConfigException.BugOrBroken( @@ -233,10 +232,9 @@ class SimpleIncluder implements FullIncluder { sb.append(", "); } sb.setLength(sb.length() - 2); - failMessage = sb.toString(); + throw new ConfigException.IO(SimpleConfigOrigin.newSimple(name), sb.toString(), + fails.get(0)); } - throw new ConfigException.IO(SimpleConfigOrigin.newSimple(name), failMessage, - fails.get(0)); } else if (!gotSomething) { if (ConfigImpl.traceLoadsEnabled()) { ConfigImpl.trace("Did not find '" + name