Return-Path: 
 <roller-commits-return-534-apmail-incubator-roller-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-roller-commits-archive@www.apache.org
Received: (qmail 44862 invoked from network); 1 Nov 2005 15:16:30 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 1 Nov 2005 15:16:30 -0000
Received: (qmail 92521 invoked by uid 500); 1 Nov 2005 15:16:29 -0000
Delivered-To: apmail-incubator-roller-commits-archive@incubator.apache.org
Received: (qmail 92491 invoked by uid 500); 1 Nov 2005 15:16:29 -0000
Mailing-List: contact roller-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:roller-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:roller-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:roller-commits@incubator.apache.org>
List-Id: <roller-commits.incubator.apache.org>
Reply-To: roller-dev@incubator.apache.org
Delivered-To: mailing list roller-commits@incubator.apache.org
Received: (qmail 92480 invoked by uid 99); 1 Nov 2005 15:16:29 -0000
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Tue, 01 Nov 2005 07:16:29 -0800
Received: (qmail 44638 invoked by uid 65534); 1 Nov 2005 15:16:09 -0000
Message-ID: <20051101151609.44637.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r330070 - /incubator/roller/trunk/web/errorBody.jsp
Date: Tue, 01 Nov 2005 15:16:08 -0000
To: roller-commits@incubator.apache.org
From: snoopdave@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: snoopdave
Date: Tue Nov  1 07:16:04 2005
New Revision: 330070

URL: http://svn.apache.org/viewcvs?rev=330070&view=rev
Log:
Added a null pointer check to errorBody.jsp

Modified:
    incubator/roller/trunk/web/errorBody.jsp

Modified: incubator/roller/trunk/web/errorBody.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/errorBody.jsp?rev=330070&r1=330069&r2=330070&view=diff
==============================================================================
--- incubator/roller/trunk/web/errorBody.jsp (original)
+++ incubator/roller/trunk/web/errorBody.jsp Tue Nov  1 07:16:04 2005
@@ -1,5 +1,7 @@
 <%@ include file="/taglibs.jsp" %>
 
+<% try { %>
+
 <c:set var="status_code" value="${requestScope['javax.servlet.error.status_code']}" />
 <c:set var="message"     value="${requestScope['javax.servlet.error.message']}" />
 <c:set var="type"        value="${requestScope['javax.servlet.error.type']}" />
@@ -27,20 +29,28 @@
 </table>
 
 <c:if test="${!empty exception}">
-    <form>
-        <textarea rows="30" style="font-size:8pt;width:80%">
-        <% 
-        java.io.StringWriter sw = new java.io.StringWriter();
-        Throwable t = (Throwable)request.getAttribute("exception");
+    <% 
+    java.io.StringWriter sw = new java.io.StringWriter();
+    Throwable t = (Throwable)pageContext.getAttribute("exception");
+    if (t != null) {
         t.printStackTrace(new java.io.PrintWriter(sw));
+        String stackTrace = sw.toString();
+        if (stackTrace.trim().length() > 0) {
         %>
-        <%= sw.toString() %>
-        </textarea>
-    </form>
+        <p>Stack Trace:</p>
+        <form>
+            <textarea rows="30" style="font-size:8pt;width:80%">
+            <%=  stackTrace %>
+            </textarea>
+        </form>
+    <%  } 
+    } %>
 </c:if>
 
 <br />
 <br />
+
+<% } catch (Throwable t) { t.printStackTrace(); } %>