Author: bpapez
Date: Thu Jan 3 10:59:56 2008
New Revision: 19450
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19450&repname=
=3Djahia
Log:
fix NPE
Modified:
trunk/core/src/webapp/jsp/jahia/engines/buttons.jsp
Modified: trunk/core/src/webapp/jsp/jahia/engines/buttons.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/buttons.jsp&rev=3D19450&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
--- trunk/core/src/webapp/jsp/jahia/engines/buttons.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/engines/buttons.jsp Thu Jan 3 10:59:56=
2008
@@ -48,6 +48,7 @@
} else {
results =3D null;
}
+ LockKey engineLockKey =3D (LockKey)engineMap.get("lock");
%>
=
<div id=3D"buttons">
@@ -98,8 +99,8 @@
<% } %>
<% } %>
<div class=3D"button">
- <a href=3D"javascript:window.close();" <% if (lockKey !=3D null &&=
results =3D=3D null && !"filemanager_fileedit".equals(jspSource)) { %>
- onclick=3D"releaseLock('<%=3D((LockKey)engineMap.get("lock")).g=
etType()%>', <%=3DjParams.getPageID()%> , <%=3Dsession.getAttribute("needTo=
RefreshParentPage") !=3D null%>)" <% } %>
+ <a href=3D"javascript:window.close();" <% if (engineLockKey !=3D n=
ull && results =3D=3D null && !"filemanager_fileedit".equals(jspSource)) { =
%>
+ onclick=3D"releaseLock('<%=3DengineLockKey.getType()%>', <%=3Dj=
Params.getPageID()%> , <%=3Dsession.getAttribute("needToRefreshParentPage")=
!=3D null%>)" <% } %>
title=3D"<jahia:engineResourceBundle resourceName=3D"org.jahia.=
altCloseWithoutSave.label"/>">
<jahia:engineResourceBundle resourceName=3D"org.jahia.button.c=
ancel"/>
</a>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
