xlawrence 2005/12/16 11:28:17 CET
Modified files:
core/src/webapp/jsp/jahia/engines engine.jsp
Log:
avoid Exceptions if dynamic include page is null
Revision Changes Path
1.32 +5 -1 jahia/core/src/webapp/jsp/jahia/engines/engine.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/engine.jsp.diff?r1=1.31&r2=1.32&f=h
Index: engine.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/engine.jsp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- engine.jsp 13 Dec 2005 18:07:01 -0000 1.31
+++ engine.jsp 16 Dec 2005 10:28:17 -0000 1.32
@@ -252,7 +252,11 @@
<input type="hidden" name="screen" value="save"/> <!-- Default
value in case of a form.submit() -->
<input type="hidden" name="lastscreen" value="<%=theScreen%>"/>
<!-- include page starts -->
- <jsp:include page="<%=includePage%>" flush="true" />
+ <% if (includePage == null || includePage.length() == 0) {
+ logger.warn("Include page in null");
+ } else { %>
+ <jsp:include page="<%=includePage%>" flush="true"/>
+ <% } %>
<!-- include page ends -->
</form>
</div><!-- end pagebody -->
