portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r328220 - /portals/jetspeed-2/trunk/commons/src/java/org/apache/jetspeed/container/JetspeedContainerServlet.java
Date Tue, 25 Oct 2005 01:33:06 GMT
Author: taylor
Date: Mon Oct 24 18:33:03 2005
New Revision: 328220

URL: http://svn.apache.org/viewcvs?rev=328220&view=rev
Log:
check for NPE

Modified:
    portals/jetspeed-2/trunk/commons/src/java/org/apache/jetspeed/container/JetspeedContainerServlet.java

Modified: portals/jetspeed-2/trunk/commons/src/java/org/apache/jetspeed/container/JetspeedContainerServlet.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/commons/src/java/org/apache/jetspeed/container/JetspeedContainerServlet.java?rev=328220&r1=328219&r2=328220&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/commons/src/java/org/apache/jetspeed/container/JetspeedContainerServlet.java
(original)
+++ portals/jetspeed-2/trunk/commons/src/java/org/apache/jetspeed/container/JetspeedContainerServlet.java
Mon Oct 24 18:33:03 2005
@@ -221,7 +221,14 @@
                 // inject the current request into the renderRequest handler (o.a.j.engine.servlet.ServletRequestImpl)
                 ((HttpServletRequestWrapper)((HttpServletRequestWrapper)renderRequest).getRequest()).setRequest(request);
 
-                portlet.render(renderRequest, renderResponse);
+                if (null == portlet)
+                {
+                    throw new Exception("Content is not available.");
+                }
+                else
+                {
+                    portlet.render(renderRequest, renderResponse);
+                }
             }
 
             // if we get this far we are home free



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


Mime
View raw message