Merge branch '1.3' into 1.4

greenlaw110 · greenlaw110 · commit a75e7b973de9 · 2017-08-03T08:20:22.000+10:00
diff --git a/src/main/java/act/i18n/I18n.java b/src/main/java/act/i18n/I18n.java
@@ -133,8 +133,12 @@ public static String i18n(Class<?> bundleSpec, Enum<?> msgId) {
     }
 
     public static String i18n(Locale locale, Class<?> bundleSpec, Enum<?> msgId) {
+        return i18n(true, locale, bundleSpec.getName(), msgId);
+    }
+
+    public static String i18n(Locale locale, String bundleName, Enum<?> msgId) {
         String key = S.newBuffer("enum.").append(msgId.getDeclaringClass().getSimpleName().toLowerCase()).append(".").append(msgId.name().toLowerCase()).toString();
-        return _i18n(true, locale, bundleSpec.getName(), key);
+        return _i18n(true, locale, bundleName, key);
     }
 
     public static Map<String, Object> i18n(Class<? extends Enum> enumClass) {
@@ -180,7 +184,7 @@ public static Map<String, Object> i18n(Locale locale, String bundleName, Class<?
 
         for (Enum<?> enumInstance : enumClass.getEnumConstants()) {
             String name = enumInstance.name();
-            String val = _i18n(true, locale, bundleName, enumInstance.name());
+            String val = i18n(locale, bundleName, enumInstance);
             if (outputProperties) {
                 Map<String, Object> values = new HashMap<>();
                 map.put(name, values);
diff --git a/src/main/java/act/job/_Job.java b/src/main/java/act/job/_Job.java
@@ -210,7 +210,7 @@ public void run() {
                 app.checkUpdates(false);
             }
             doJob();
-        } catch (RuntimeException e) {
+        } catch (Throwable e) {
             boolean isFatal = FATAL_EXCEPTIONS.contains(e.getClass());
             Throwable cause = e;
             if (!isFatal) {

Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ public void run() {`
`210`	`210`	`app.checkUpdates(false);`
`211`	`211`	`}`
`212`	`212`	`doJob();`
`213`		`- } catch (RuntimeException e) {`
	`213`	`+ } catch (Throwable e) {`
`214`	`214`	`boolean isFatal = FATAL_EXCEPTIONS.contains(e.getClass());`
`215`	`215`	`Throwable cause = e;`
`216`	`216`	`if (!isFatal) {`