Merge pull request #1244 from mebigfatguy/master

fix handling of invalid weavingMode property
Netflix · Jun 14, 2016 · 25da664 · 25da664
2 parents 31cf0fe + cbe3a00
commit 25da664
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/...b/hystrix-javanica/src/main/java/com/netflix/hystrix/contrib/javanica/utils/EnvUtils.java b/...b/hystrix-javanica/src/main/java/com/netflix/hystrix/contrib/javanica/utils/EnvUtils.java
@@ -29,10 +29,11 @@ private EnvUtils(){
 
     public static WeavingMode getWeavingMode() {
         String wavingModeParam = System.getProperty("weavingMode", WeavingMode.RUNTIME.name()).toUpperCase();
-        WeavingMode weavingMode = WeavingMode.valueOf(wavingModeParam);
-        if (weavingMode == null)
-            throw new IllegalArgumentException("wrong 'weavingMode' property, supported: " + Arrays.toString(WeavingMode.values()) + ", actual = " + wavingModeParam);
-        return weavingMode;
+        try {
+            return WeavingMode.valueOf(wavingModeParam);
+        } catch (IllegalArgumentException e) {
+            throw new IllegalArgumentException("wrong 'weavingMode' property, supported: " + Arrays.toString(WeavingMode.values()) + ", actual = " + wavingModeParam, e);
+        }
     }
 
     public static boolean isCompileWeaving() {