Anonymous avatar Anonymous committed 061294c

Added additional check for model driven action WW-2124

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

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;
+                        }
                     }
                 }
             }
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.