Author: xlawrence
Date: Wed Aug 29 13:30:22 2007
New Revision: 18295
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18295&repname=
=3Djahia
Log:
Avoid NPE in read_only page field.
Fix for (JAHIA-2193): Sp3: Read-only engine error at org.jahia.jsp.jahia.wa=
r.jsp.jahia.engines.shared.readonly_005fpage_005ffield_jsp._jspService(read=
only_005fpage_005ffield_jsp.java:185)
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/r=
eadonly_page_field.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh=
ared/readonly_page_field.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/shared/readonly_page_field.jsp&re=
v=3D18295&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/r=
eadonly_page_field.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/r=
eadonly_page_field.jsp Wed Aug 29 13:30:22 2007
@@ -16,19 +16,17 @@
limitations under the License.
--%>
<%@ page language=3D"java" contentType=3D"text/html;charset=3DUTF-8" %>
+<%@ page import=3D"org.apache.commons.lang.StringUtils" %>
<%@ page import=3D"org.jahia.data.fields.JahiaField" %>
+<%@ page import=3D"org.jahia.engines.EngineLanguageHelper" %>
<%@ page import=3D"org.jahia.engines.JahiaEngine" %>
<%@ page import=3D"org.jahia.engines.shared.JahiaPageEngineTempBean" %>
+<%@ page import=3D"org.jahia.params.ProcessingContext" %>
<%@ page import=3D"org.jahia.services.pages.ContentPage" %>
<%@ page import=3D"org.jahia.services.pages.JahiaPageBaseService" %>
-<%@ page import=3D"org.jahia.params.ParamBean" %>
-<%@ page import=3D"org.apache.commons.lang.StringUtils" %>
<%@ page import=3D"org.jahia.services.pages.JahiaPageDefinition" %>
-<%@ page import=3D"java.util.*" %>
-<%@ page import=3D"org.jahia.engines.shared.Page_Field"%>
<%@ page import=3D"org.jahia.utils.JahiaTools"%>
-<%@ page import=3D"org.jahia.params.ProcessingContext"%>
-<%@ page import=3D"org.jahia.engines.EngineLanguageHelper"%>
+<%@ page import=3D"java.util.*"%>
<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
=
<%!
@@ -149,7 +147,12 @@
}
}
=
- int sourcePageID =3D pageBean.getPageLinkID();
+ final int sourcePageID;
+ if (pageBean =3D=3D null) {
+ sourcePageID =3D -1;
+ } else {
+ sourcePageID =3D pageBean.getPageLinkID();
+ }
String sourceTitle =3D null;
if (sourcePageID !=3D -1) {
final ContentPage sourcePage =3D jahiaPageBaseService.lookupConten=
tPage(sourcePageID, false);
@@ -157,7 +160,13 @@
if (titles !=3D null)
sourceTitle =3D (String) titles.get(processingLocale.toString(=
));
}
- final String remoteURL =3D pageBean.getRemoteURL();
+ final String remoteURL;
+ if (pageBean =3D=3D null) {
+ remoteURL =3D null;
+ } else {
+ remoteURL =3D pageBean.getRemoteURL();
+ }
+
%>
=
=
@@ -230,13 +239,15 @@
templateList =3D (Enumeration) engineMap.get("template=
List");
}
%>
+ <% if (templateList !=3D null) { %>
<% while (templateList.hasMoreElements()) {
JahiaPageDefinition theTemplate =3D (JahiaPageDefinition) =
templateList.nextElement();
if (theTemplate.getID() =3D=3D pageBean.getPageTemplateID(=
)) { %>
<%=3DtheTemplate.getName() %>
<% break; } %>
<% } %>
- <% if (templateNotFound.booleanValue()) { %>
+ <% } %>
+ <% if (templateNotFound =3D=3D null || templateNotFound.boolea=
nValue()) { %>
Template not found !!! Deleted ?
<% } %>
</td>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
