Fix for https://glassfish.dev.java.net/issues/show_bug.cgi?id=9657 ("incorrect server.web.jsp.activejspsloadedcount-count")

Jan Luehe · Jan Luehe · commit e93981c5db95 · 2009-09-22T23:42:45.000Z
Tests run: QL

svn path=/trunk/; revision=1171
diff --git a/impl/src/main/java/org/apache/jasper/servlet/JspServletWrapper.java b/impl/src/main/java/org/apache/jasper/servlet/JspServletWrapper.java
@@ -120,6 +120,7 @@ public class JspServletWrapper {
     private boolean isTagFile;
     private int tripCount;
     private JasperException compileException;
+    private JspProbeEmitter jspProbeEmitter;
     /* PWC 6468930
     private long servletClassLastModifiedTime;
     */
@@ -140,6 +141,10 @@ public class JspServletWrapper {
         this.config = config;
         this.options = options;
         this.jspUri = jspUri;
+        this.jspProbeEmitter = (JspProbeEmitter)
+            config.getServletContext().getAttribute(
+                "org.glassfish.jsp.monitor.probeEmitter");
+
         ctxt = new JspCompilationContext(jspUri, isErrorPage, options,
 					 config.getServletContext(),
 					 this, rctxt);
@@ -208,15 +213,9 @@ public Servlet getServlet()
 
                     reload = false;
 
-                    /*
-                     * If the container implements JspProbeEmitter, fire the
-                     * Jsp loaded event.
-                     */
-                    JspProbeEmitter jspProbe = (JspProbeEmitter)
-                        getServletContext().getAttribute(
-                            "org.glassfish.jsp.monitor.probeEmitter");
-                    if (jspProbe != null) {
-                        jspProbe.jspLoadedEvent(theServlet);
+                    // Fire the jspLoadedEvent probe event
+                    if (jspProbeEmitter != null) {
+                        jspProbeEmitter.jspLoadedEvent(theServlet);
                     }
                 }
             }    
@@ -436,6 +435,10 @@ public void service(HttpServletRequest request,
     public void destroy() {
         if (theServlet != null) {
             theServlet.destroy();
+            // Fire the jspDestroyedEvent probe event
+            if (jspProbeEmitter != null) {
+                jspProbeEmitter.jspDestroyedEvent(theServlet);
+            }
         }
     }
 
diff --git a/impl/src/main/java/org/glassfish/jsp/api/JspProbeEmitter.java b/impl/src/main/java/org/glassfish/jsp/api/JspProbeEmitter.java
@@ -36,6 +36,8 @@
 
 package org.glassfish.jsp.api;
 
+import javax.servlet.Servlet;
+
 /**
  * Interface for triggering events useful for monitoring.
  *
@@ -45,7 +47,8 @@
 
 public interface JspProbeEmitter {
 
-    public void jspLoadedEvent(javax.servlet.Servlet jspServlet);
+    public void jspLoadedEvent(Servlet jspServlet);
 
+    public void jspDestroyedEvent(Servlet jspServlet);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,8 @@`
`36`	`36`
`37`	`37`	`package org.glassfish.jsp.api;`
`38`	`38`
	`39`	`+import javax.servlet.Servlet;`
	`40`	`+`
`39`	`41`	`/**`
`40`	`42`	`* Interface for triggering events useful for monitoring.`
`41`	`43`	`*`
`@@ -45,7 +47,8 @@`
`45`	`47`
`46`	`48`	`public interface JspProbeEmitter {`
`47`	`49`
`48`		`- public void jspLoadedEvent(javax.servlet.Servlet jspServlet);`
	`50`	`+ public void jspLoadedEvent(Servlet jspServlet);`
`49`	`51`
	`52`	`+ public void jspDestroyedEvent(Servlet jspServlet);`
`50`	`53`	`}`
`51`	`54`