Commits

Anonymous committed 061294c

Added additional check for model driven action WW-2124

git-svn-id: http://svn.opensymphony.com/svn/xwork/branches/2.0@1590e221344d-f017-0410-9bd5-d282ab1896d7

  • Participants
  • Parent commits d6151a9
  • Branches 2.0, xwork_2_0_7

Comments (0)

Files changed (1)

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

             // ActionInvocation may be null if we're being run from a Sitemesh filter, so we won't get model texts if this is null
             if (actionInvocation != null) {
                 Object action = actionInvocation.getAction();
-                Object model = ((ModelDriven) action).getModel();
-                if (model != null) {
-                    msg = findMessage(model.getClass(), aTextName, indexedTextName, locale, args, null, valueStack);
-                    if (msg != null) {
-                        return msg;
+                if (action instanceof ModelDriven) {
+                    Object model = ((ModelDriven) action).getModel();
+                    if (model != null) {
+                        msg = findMessage(model.getClass(), aTextName, indexedTextName, locale, args, null, valueStack);
+                        if (msg != null) {
+                            return msg;
+                        }
                     }
                 }
             }