craigmcc 00/11/29 10:52:23
Modified: src/admin/WEB-INF/classes Tag: tomcat_32 ContextAdmin.java
src/admin/contextAdmin Tag: tomcat_32 contextAdmin.jsp
Log:
Provide an intelligible error message ("You must mark the administration
application as trusted") instead of an NPE when you execute the admin
application when it is not marked trusted.
Revision Changes Path
No revision
No revision
1.4.2.1 +9 -0 jakarta-tomcat/src/admin/WEB-INF/classes/ContextAdmin.java
Index: ContextAdmin.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/classes/ContextAdmin.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- ContextAdmin.java 2000/06/22 23:48:55 1.4
+++ ContextAdmin.java 2000/11/29 18:52:19 1.4.2.1
@@ -43,8 +43,17 @@
public void init(HttpServletRequest request) {
FacadeManager facadeM=(FacadeManager)request.getAttribute(
FacadeManager.FACADE_ATTRIBUTE);
+ if (facadeM == null) {
+ realRequest = null;
+ cm = null;
+ return;
+ }
realRequest = facadeM.getRealRequest(request);
cm = realRequest.getContext().getContextManager();
+ }
+
+ public boolean initialized() {
+ return (cm != null);
}
public Enumeration getContextNames() {
No revision
No revision
1.1.4.1 +5 -0 jakarta-tomcat/src/admin/contextAdmin/contextAdmin.jsp
Index: contextAdmin.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/admin/contextAdmin/contextAdmin.jsp,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- contextAdmin.jsp 2000/02/18 18:33:03 1.1
+++ contextAdmin.jsp 2000/11/29 18:52:22 1.1.4.1
@@ -26,6 +26,11 @@
if (param != null) {
contextAdmin.init(request);
+ if (!contextAdmin.initialized()) {
+ response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
+ "You must mark the administration application as trusted");
+ return;
+ }
if (param.equals("View All Contexts")) {
Enumeration enum = contextAdmin.getContextNames();
