Author: hadrian
Date: Mon May 30 22:24:41 2011
New Revision: 1129407
URL: http://svn.apache.org/viewvc?rev=1129407&view=rev
Log:
CAMEL-3861. Port fix to camel-2.7.x
Modified:
camel/branches/camel-2.7.x/ (props changed)
camel/branches/camel-2.7.x/components/camel-http/ (props changed)
camel/branches/camel-2.7.x/components/camel-web/src/main/webapp/WEB-INF/org/apache/camel/web/resources/ExchangeResource.index.ssp
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 30 22:24:41 2011
@@ -1 +1 @@
-/camel/trunk:1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518,1091771,1091799
+/camel/trunk:1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518,1091771,1091799,1092068
Propchange: camel/branches/camel-2.7.x/components/camel-http/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 30 22:24:41 2011
@@ -1 +1 @@
-/camel/trunk/components/camel-http:917526,1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518,1091771,1091799
+/camel/trunk/components/camel-http:917526,1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518,1091771,1091799,1092068
Modified:
camel/branches/camel-2.7.x/components/camel-web/src/main/webapp/WEB-INF/org/apache/camel/web/resources/ExchangeResource.index.ssp
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-web/src/main/webapp/WEB-INF/org/apache/camel/web/resources/ExchangeResource.index.ssp?rev=1129407&r1=1129406&r2=1129407&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/components/camel-web/src/main/webapp/WEB-INF/org/apache/camel/web/resources/ExchangeResource.index.ssp
(original)
+++
camel/branches/camel-2.7.x/components/camel-web/src/main/webapp/WEB-INF/org/apache/camel/web/resources/ExchangeResource.index.ssp
Mon May 30 22:24:41 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>
