Return-Path: 
 <commits-return-15039-apmail-camel-commits-archive=camel.apache.org@camel.apache.org>
Delivered-To: apmail-camel-commits-archive@www.apache.org
Received: (qmail 91064 invoked from network); 14 Apr 2011 09:09:00 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 14 Apr 2011 09:09:00 -0000
Received: (qmail 96621 invoked by uid 500); 14 Apr 2011 09:09:00 -0000
Delivered-To: apmail-camel-commits-archive@camel.apache.org
Received: (qmail 96562 invoked by uid 500); 14 Apr 2011 09:08:58 -0000
Mailing-List: contact commits-help@camel.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@camel.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@camel.apache.org>
List-Post: <mailto:commits@camel.apache.org>
List-Id: <commits.camel.apache.org>
Reply-To: dev@camel.apache.org
Delivered-To: mailing list commits@camel.apache.org
Received: (qmail 96554 invoked by uid 99); 14 Apr 2011 09:08:57 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Apr 2011 09:08:57 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Apr 2011 09:08:56 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 71C1123889F7; Thu, 14 Apr 2011 09:08:36 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1092068 -
 /camel/trunk/components/camel-web/src/main/webapp/WEB-INF/org/apache/camel/web/resources/ExchangeResource.index.ssp
Date: Thu, 14 Apr 2011 09:08:36 -0000
To: commits@camel.apache.org
From: davsclaus@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110414090836.71C1123889F7@eris.apache.org>

Author: davsclaus
Date: Thu Apr 14 09:08:36 2011
New Revision: 1092068

URL: http://svn.apache.org/viewvc?rev=1092068&view=rev
Log:
CAMEL-3861: Fixe NPE in camel-web when browsing messages on endpoints.

Modified:
    camel/trunk/components/camel-web/src/main/webapp/WEB-INF/org/apache/camel/web/resources/ExchangeResource.index.ssp

Modified: camel/trunk/components/camel-web/src/main/webapp/WEB-INF/org/apache/camel/web/resources/ExchangeResource.index.ssp
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/webapp/WEB-INF/org/apache/camel/web/resources/ExchangeResource.index.ssp?rev=1092068&r1=1092067&r2=1092068&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/webapp/WEB-INF/org/apache/camel/web/resources/ExchangeResource.index.ssp (original)
+++ camel/trunk/components/camel-web/src/main/webapp/WEB-INF/org/apache/camel/web/resources/ExchangeResource.index.ssp Thu Apr 14 09:08:36 2011
@@ -20,7 +20,11 @@
         #for(entry <- it.getProperties)
           <tr>
             <td>${entry.getKey}</td>
-            <td><a class="type" title="${entry.getValue.getClass.getCanonicalName}">${entry.getValue}</a></td>
+            #if(entry.getValue != null)
+              <td><a class="type" title="${entry.getValue.getClass.getCanonicalName}">${entry.getValue}</a></td>
+            #else
+              <td><a class="type">null</a></td>
+            #end
           </tr>
         #end
       </table>
@@ -37,7 +41,11 @@
         #for(entry <- it.getHeaders)
           <tr>
             <td>${entry.getKey}</td>
-            <td><a class="type" title="${entry.getValue.getClass.getCanonicalName}">${entry.getValue}</a></td>
+            #if(entry.getValue != null)
+              <td><a class="type" title="${entry.getValue.getClass.getCanonicalName}">${entry.getValue}</a></td>
+            #else
+              <td><a class="type">null</a></td>
+            #end
           </tr>
         #end
       </table>
@@ -45,7 +53,11 @@
   </tr>
   <tr>
     <th colspan="2">
+    #if(it.getIn.getBody != null)
       Message Body is Java Class: ${it.getIn.getBody.getClass.getCanonicalName}
+    #else
+      Message Body is Java Class: null
+    #end
     </th>
   </tr>
   <tr>