Author: athimel Date: 2011-08-03 10:22:46 +0200 (Wed, 03 Aug 2011) New Revision: 1939 Url: http://nuiton.org/repositories/revision/i18n/1939 Log: Prevent case when result is null Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java 2011-08-03 07:27:28 UTC (rev 1938) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java 2011-08-03 08:22:46 UTC (rev 1939) @@ -276,7 +276,10 @@ // } try { - return applyFilter(messageFormatter.format(locale, result, args)); + if (result != null) { + result = applyFilter(messageFormatter.format(locale, result, args)); + } + return result; } catch (Exception eee) { try { return applyFilter(messageFormatter.format(locale, message, args)); Modified: trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java =================================================================== --- trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java 2011-08-03 07:27:28 UTC (rev 1938) +++ trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java 2011-08-03 08:22:46 UTC (rev 1939) @@ -243,6 +243,9 @@ text = I18n._(key); Assert.assertNull(text); + + text = I18n._(key, 123); + Assert.assertNull(text); } @Test