Author: pbenedict Date: Wed Apr 4 22:25:08 2007 New Revision: 525705 URL: http://svn.apache.org/viewvc?view=rev&rev=525705 Log: STR-3020: Do not emit error when type can be justifiably omitted
Modified: struts/struts1/branches/STRUTS_1_3_BRANCH/core/src/main/java/org/apache/struts/chain/commands/AbstractCreateAction.java Modified: struts/struts1/branches/STRUTS_1_3_BRANCH/core/src/main/java/org/apache/struts/chain/commands/AbstractCreateAction.java URL: http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/core/src/main/java/org/apache/struts/chain/commands/AbstractCreateAction.java?view=diff&rev=525705&r1=525704&r2=525705 ============================================================================== --- struts/struts1/branches/STRUTS_1_3_BRANCH/core/src/main/java/org/apache/struts/chain/commands/AbstractCreateAction.java (original) +++ struts/struts1/branches/STRUTS_1_3_BRANCH/core/src/main/java/org/apache/struts/chain/commands/AbstractCreateAction.java Wed Apr 4 22:25:08 2007 @@ -76,9 +76,10 @@ String type = actionConfig.getType(); if (type == null) { - if ((actionConfig.getForward() == null) + String command = actionConfig.getCommand(); + if ((command == null) && (actionConfig.getForward() == null) && (actionConfig.getInclude() == null)) { - LOG.error("no type for " + actionConfig.getPath()); + LOG.error("no type or command for " + actionConfig.getPath()); } else { LOG.trace("no type for " + actionConfig.getPath()); }