Commits

Anonymous committed 95c088c

Message lookup throws NullPointerException for indexed property if message is not found

Issue Number: XW-553

git-svn-id: http://svn.opensymphony.com/svn/xwork/trunk@1640e221344d-f017-0410-9bd5-d282ab1896d7

  • Participants
  • Parent commits f6dd49a

Comments (0)

Files changed (1)

File src/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java

             result = getDefaultMessage(aTextName, locale, valueStack, args, defaultMessage);
         } else {
             result = getDefaultMessage(aTextName, locale, valueStack, args, null);
-            if (result.message != null) {
+            if (result != null && result.message != null) {
                 return result.message;
             }
             result = getDefaultMessage(indexedTextName, locale, valueStack, args, defaultMessage);