Commits

Anonymous committed 5f0551a

Fixed NPE when unknown handler is null when a result can't be found
WW-1577

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

  • Participants
  • Parent commits b58adcb

Comments (0)

Files changed (1)

src/java/com/opensymphony/xwork2/DefaultActionInvocation.java

                 LOG.error("There was an exception while instantiating the result of type " + resultConfig.getClassName(), e);
                 throw new XWorkException(e, resultConfig);
             }
-        } else if (resultCode != null && !Action.NONE.equals(resultCode)) {
+        } else if (resultCode != null && !Action.NONE.equals(resultCode) && unknownHandler != null) {
             return unknownHandler.handleUnknownResult(invocationContext, proxy.getActionName(), proxy.getConfig(), resultCode);
         }
         return null;