openmrs · Apr 24, 2013 · Apr 24, 2013
Showing with 83 additions and 1 deletion.

+6 −0 web/pom.xml

+9 −0 web/src/main/java/org/openmrs/module/web/WebModuleUtil.java

+67 −0 web/src/main/java/org/openmrs/web/OpenmrsJspServlet.java

+1 −1 webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/web/pom.xml b/web/pom.xml
@@ -133,6 +133,12 @@
 		 <artifactId>mysql-connector-mxj</artifactId>
 		 <scope>provided</scope>
 	  </dependency>
+	  <dependency>
+	      <groupId>org.apache.tomcat</groupId>
+	      <artifactId>jasper</artifactId>
+	      <version>6.0.18</version>
+	      <scope>provided</scope>
+     </dependency>
    </dependencies>
 
    <build>

diff --git a/web/src/main/java/org/openmrs/module/web/WebModuleUtil.java b/web/src/main/java/org/openmrs/module/web/WebModuleUtil.java
@@ -58,6 +58,7 @@
 import org.openmrs.util.OpenmrsUtil;
 import org.openmrs.util.PrivilegeConstants;
 import org.openmrs.web.DispatcherServlet;
+import org.openmrs.web.OpenmrsJspServlet;
 import org.openmrs.web.StaticDispatcherServlet;
 import org.openmrs.web.dwr.OpenmrsDWRServlet;
 import org.springframework.web.context.support.WebApplicationContextUtils;
@@ -854,9 +855,17 @@ public static XmlWebApplicationContext refreshWAC(ServletContext servletContext,
 			staticDispatcherServlet.stopAndCloseApplicationContext();
 		}
 
+		if (OpenmrsJspServlet.jspServlet != null) {
+			OpenmrsJspServlet.jspServlet.stop();
+		}
+
 		XmlWebApplicationContext newAppContext = (XmlWebApplicationContext) ModuleUtil.refreshApplicationContext(wac,
 		    isOpenmrsStartup, startedModule);
 
+		if (OpenmrsJspServlet.jspServlet != null) {
+			OpenmrsJspServlet.jspServlet.refresh();
+		}
+
 		try {
 			// must "refresh" the spring dispatcherservlet as well to add in
 			//the new handlerMappings

diff --git a/web/src/main/java/org/openmrs/web/OpenmrsJspServlet.java b/web/src/main/java/org/openmrs/web/OpenmrsJspServlet.java
@@ -0,0 +1,67 @@
+/**
+ * The contents of this file are subject to the OpenMRS Public License
+ * Version 1.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://license.openmrs.org
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * Copyright (C) OpenMRS, LLC.  All Rights Reserved.
+ */
+package org.openmrs.web;
+
+import java.lang.reflect.Field;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.jasper.servlet.JspServlet;
+
+/**
+ * This class is only used to get access to the JspServlet. <br/>
+ * <br/>
+ * When Spring's root webApplicationContext is refreshed, this servlet needs to be refreshed too
+ * because it has references (via the objects it creates like JspRuntimeContext, etc) to the openmrs
+ * class loader that is being destroyed.
+ */
+public class OpenmrsJspServlet extends JspServlet {
+
+	private static final long serialVersionUID = 1L;
+
+	private Log log = LogFactory.getLog(this.getClass());
+
+	public static OpenmrsJspServlet jspServlet;
+
+	public void init(ServletConfig config) throws ServletException {
+		super.init(config);
+
+		jspServlet = this;
+	}
+
+	public void stop() {
+		try {
+			this.destroy();
+		}
+		catch (Throwable ex) {
+			log.error(ex);
+		}
+	}
+
+	public void refresh() {
+		try {
+			//Get a reference to the private ServletConfig config such that we
+			//can initialize the servlet again.
+			Field field = this.getClass().getSuperclass().getDeclaredField("config");
+			field.setAccessible(true);
+			init((ServletConfig) field.get(this));
+		}
+		catch (Throwable ex) {
+			log.error(ex);
+		}
+	}
+}
diff --git a/webapp/src/main/webapp/WEB-INF/web.xml b/webapp/src/main/webapp/WEB-INF/web.xml
@@ -375,7 +375,7 @@
 
 	<servlet>
 		<servlet-name>jsp</servlet-name>
-		<servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
+		<servlet-class>org.openmrs.web.OpenmrsJspServlet</servlet-class>
 	</servlet>
 
 	<!-- Gives access to servlets within modules -->