camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1143951 - in /camel/branches/camel-2.7.x: ./ components/camel-web/src/main/webapp/WEB-INF/org/apache/camel/web/resources/RoutesResource.index.ssp
Date Thu, 07 Jul 2011 18:18:04 GMT
Author: dkulp
Date: Thu Jul  7 18:18:04 2011
New Revision: 1143951

URL: http://svn.apache.org/viewvc?rev=1143951&view=rev
Log:
Merged revisions 1084150 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1084150 | janstey | 2011-03-22 08:50:35 -0400 (Tue, 22 Mar 2011) | 1 line
  
  CAMEL-3797 - Patch from Dejan to fix NPE in web console when browsing routes with no description.
........

Modified:
    camel/branches/camel-2.7.x/   (props changed)
    camel/branches/camel-2.7.x/components/camel-web/src/main/webapp/WEB-INF/org/apache/camel/web/resources/RoutesResource.index.ssp

Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul  7 18:18:04 2011
@@ -1 +1 @@
-/camel/trunk:1083696,1086231,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1090960-1090969,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1094156,1095405,1095469,1095471,1095475-1095476,1097912,1099417,1102162,1104076,1124497,1127744,1127988,1131411,1134252,1134501,1135364,1139163,1143925
+/camel/trunk:1083696,1084150,1086231,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1090960-1090969,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1094156,1095405,1095469,1095471,1095475-1095476,1097912,1099417,1102162,1104076,1124497,1127744,1127988,1131411,1134252,1134501,1135364,1139163,1143925

Modified: camel/branches/camel-2.7.x/components/camel-web/src/main/webapp/WEB-INF/org/apache/camel/web/resources/RoutesResource.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/RoutesResource.index.ssp?rev=1143951&r1=1143950&r2=1143951&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/components/camel-web/src/main/webapp/WEB-INF/org/apache/camel/web/resources/RoutesResource.index.ssp
(original)
+++ camel/branches/camel-2.7.x/components/camel-web/src/main/webapp/WEB-INF/org/apache/camel/web/resources/RoutesResource.index.ssp
Thu Jul  7 18:18:04 2011
@@ -18,7 +18,7 @@
   #for(i <- it.getRoutes)
   <tr>
     <td>
-      <a href='${uri("/routes/" + i.getId)}'>${i.getId}</a> ${i.getDescription.getText}
+      <a href='${uri("/routes/" + i.getId)}'>${i.getId}</a> ${i.getDescriptionText}
     </td>
     <td class="${i.getStatus}">
       ${i.getStatus}



Mime
View raw message