You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by cr...@apache.org on 2005/01/08 20:17:33 UTC

svn commit: r124668 - /struts/faces/trunk/core-library/src/java/org/apache/struts/faces/application/FacesRequestProcessor.java /struts/faces/trunk/core-library/src/java/org/apache/struts/faces/application/FacesTilesRequestProcessor.java

Author: craigmcc
Date: Sat Jan  8 11:17:31 2005
New Revision: 124668

URL: http://svn.apache.org/viewcvs?view=rev&rev=124668
Log:
Correct NPE when debug log messages are enabled and an Action returns null
instead of an ActionForward instance.

PR:  Bugzilla #32959
Submitted By: Hanson Char <hanson.char AT gmail.com>

Modified:
   struts/faces/trunk/core-library/src/java/org/apache/struts/faces/application/FacesRequestProcessor.java
   struts/faces/trunk/core-library/src/java/org/apache/struts/faces/application/FacesTilesRequestProcessor.java

Modified: struts/faces/trunk/core-library/src/java/org/apache/struts/faces/application/FacesRequestProcessor.java
Url: http://svn.apache.org/viewcvs/struts/faces/trunk/core-library/src/java/org/apache/struts/faces/application/FacesRequestProcessor.java?view=diff&rev=124668&p1=struts/faces/trunk/core-library/src/java/org/apache/struts/faces/application/FacesRequestProcessor.java&r1=124667&p2=struts/faces/trunk/core-library/src/java/org/apache/struts/faces/application/FacesRequestProcessor.java&r2=124668
==============================================================================
--- struts/faces/trunk/core-library/src/java/org/apache/struts/faces/application/FacesRequestProcessor.java	(original)
+++ struts/faces/trunk/core-library/src/java/org/apache/struts/faces/application/FacesRequestProcessor.java	Sat Jan  8 11:17:31 2005
@@ -239,7 +239,8 @@
                                        form, mapping);
         if (log.isDebugEnabled()) {
             log.debug("Standard action perform returned " +
-                      result.getPath() + " forward path");
+                      (result.getPath() == null ? "NULL" :
+                      result.getPath()) + " forward path");
         }
         return (result);
 

Modified: struts/faces/trunk/core-library/src/java/org/apache/struts/faces/application/FacesTilesRequestProcessor.java
Url: http://svn.apache.org/viewcvs/struts/faces/trunk/core-library/src/java/org/apache/struts/faces/application/FacesTilesRequestProcessor.java?view=diff&rev=124668&p1=struts/faces/trunk/core-library/src/java/org/apache/struts/faces/application/FacesTilesRequestProcessor.java&r1=124667&p2=struts/faces/trunk/core-library/src/java/org/apache/struts/faces/application/FacesTilesRequestProcessor.java&r2=124668
==============================================================================
--- struts/faces/trunk/core-library/src/java/org/apache/struts/faces/application/FacesTilesRequestProcessor.java	(original)
+++ struts/faces/trunk/core-library/src/java/org/apache/struts/faces/application/FacesTilesRequestProcessor.java	Sat Jan  8 11:17:31 2005
@@ -253,7 +253,8 @@
                                        form, mapping);
         if (log.isDebugEnabled()) {
             log.debug("Standard action perform returned " +
-                      result.getPath() + " forward path");
+                      (result.getPath() == null ? "NULL" :
+                      result.getPath()) + " forward path");
         }
         return (result);
 

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org