cvs commit: jakarta-struts/src/share/org/apache/struts/action ActionMapping.java

[craigmcc]

craigmcc    01/10/03 20:02:27

  Modified:    src/share/org/apache/struts/action ActionMapping.java
  Log:
  Port fix for Bugzilla #2226 to HEAD branch.
  
  Revision  Changes    Path
  1.19      +12 -5     
jakarta-struts/src/share/org/apache/struts/action/ActionMapping.java
  
  Index: ActionMapping.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionMapping.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- ActionMapping.java        2001/05/20 04:54:41     1.18
  +++ ActionMapping.java        2001/10/04 03:02:27     1.19
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionMapping.java,v 1.18 
2001/05/20 04:54:41 craigmcc Exp $
  - * $Revision: 1.18 $
  - * $Date: 2001/05/20 04:54:41 $
  + * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionMapping.java,v 1.19 
2001/10/04 03:02:27 craigmcc Exp $
  + * $Revision: 1.19 $
  + * $Date: 2001/10/04 03:02:27 $
    *
    * ====================================================================
    *
  @@ -130,7 +130,7 @@
    * </ul>
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.18 $ $Date: 2001/05/20 04:54:41 $
  + * @version $Revision: 1.19 $ $Date: 2001/10/04 03:02:27 $
    */
   
   public class ActionMapping implements Serializable {
  @@ -623,7 +623,14 @@
               return (forward);
   
           // Second, check the globally defined forwards
  -        return (getMappings().getServlet().findForward(name));
  +        ActionMappings mappings = getMappings();
  +        if (mappings == null)
  +            return (null);
  +        ActionServlet servlet = mappings.getServlet();
  +        if (servlet == null)
  +            return (null);
  +        else
  +            return (servlet.findForward(name));
   
       }