Fix for CR 6900384 ("jpsName is missing in probe signatures in jsp related probes")

Jan Luehe · Jan Luehe · commit cee0f342cb3c · 2009-11-12T03:05:46.000Z
Tests run: QL

svn path=/trunk/; revision=1206
diff --git a/impl/src/main/java/org/apache/jasper/servlet/JspServlet.java b/impl/src/main/java/org/apache/jasper/servlet/JspServlet.java
@@ -373,25 +373,25 @@ public void service(HttpServletRequest request,
             serviceJspFile(request, response, jspUri, null, precompile);
         } catch (RuntimeException e) {
             // STARTS S1AS
-            incrementErrorCount();
+            incrementErrorCount(jspUri);
             // END S1AS
             throw e;
         } catch (Error e) {
-            incrementErrorCount();
+            incrementErrorCount(jspUri);
             throw e;
         } catch (ServletException e) {
             // STARTS S1AS
-            incrementErrorCount();
+            incrementErrorCount(jspUri);
             // END S1AS
             throw e;
         } catch (IOException e) {
             // STARTS S1AS
-            incrementErrorCount();
+            incrementErrorCount(jspUri);
             // END S1AS
             throw e;
         } catch (Throwable e) {
             // STARTS S1AS
-            incrementErrorCount();
+            incrementErrorCount(jspUri);
             // END S1AS
             throw new ServletException(e);
         }
@@ -486,11 +486,11 @@ private void serviceJspFile(HttpServletRequest request,
 
 
     // STARTS S1AS
-    private void incrementErrorCount() {
+    private void incrementErrorCount(String jspUri) {
         countErrors.incrementAndGet();
         // Fire the jspErrorEvent probe event
         if (jspProbeEmitter != null) {
-            jspProbeEmitter.jspErrorEvent();
+            jspProbeEmitter.jspErrorEvent(jspUri);
         }
     }
     // END S1AS
diff --git a/impl/src/main/java/org/apache/jasper/servlet/JspServletWrapper.java b/impl/src/main/java/org/apache/jasper/servlet/JspServletWrapper.java
@@ -211,15 +211,15 @@ public Servlet getServlet()
                         ctxt.getRuntimeContext().incrementJspReloadCount();
                         // Fire the jspReloadedEvent probe event
                         if (jspProbeEmitter != null) {
-                            jspProbeEmitter.jspReloadedEvent(theServlet);
+                            jspProbeEmitter.jspReloadedEvent(jspUri);
                         }
                     }
 
                     reload = false;
 
                     // Fire the jspLoadedEvent probe event
                     if (jspProbeEmitter != null) {
-                        jspProbeEmitter.jspLoadedEvent(theServlet);
+                        jspProbeEmitter.jspLoadedEvent(jspUri);
                     }
                 }
             }
@@ -443,7 +443,7 @@ public void destroy() {
             theServlet.destroy();
             // Fire the jspDestroyedEvent probe event
             if (jspProbeEmitter != null) {
-                jspProbeEmitter.jspDestroyedEvent(theServlet);
+                jspProbeEmitter.jspDestroyedEvent(jspUri);
             }
         }
     }
diff --git a/impl/src/main/java/org/glassfish/jsp/api/JspProbeEmitter.java b/impl/src/main/java/org/glassfish/jsp/api/JspProbeEmitter.java
@@ -47,12 +47,11 @@
 
 public interface JspProbeEmitter {
 
-    public void jspLoadedEvent(Servlet jspServlet);
+    public void jspLoadedEvent(String jspUri);
 
-    public void jspReloadedEvent(Servlet jspServlet);
+    public void jspReloadedEvent(String jspUri);
 
-    public void jspDestroyedEvent(Servlet jspServlet);
+    public void jspDestroyedEvent(String jspUri);
 
-    public void jspErrorEvent();
+    public void jspErrorEvent(String jspUri);
 }
-

Original file line number	Diff line number	Diff line change
`@@ -211,15 +211,15 @@ public Servlet getServlet()`
`211`	`211`	`ctxt.getRuntimeContext().incrementJspReloadCount();`
`212`	`212`	`// Fire the jspReloadedEvent probe event`
`213`	`213`	`if (jspProbeEmitter != null) {`
`214`		`- jspProbeEmitter.jspReloadedEvent(theServlet);`
	`214`	`+ jspProbeEmitter.jspReloadedEvent(jspUri);`
`215`	`215`	`}`
`216`	`216`	`}`
`217`	`217`
`218`	`218`	`reload = false;`
`219`	`219`
`220`	`220`	`// Fire the jspLoadedEvent probe event`
`221`	`221`	`if (jspProbeEmitter != null) {`
`222`		`- jspProbeEmitter.jspLoadedEvent(theServlet);`
	`222`	`+ jspProbeEmitter.jspLoadedEvent(jspUri);`
`223`	`223`	`}`
`224`	`224`	`}`
`225`	`225`	`}`
`@@ -443,7 +443,7 @@ public void destroy() {`
`443`	`443`	`theServlet.destroy();`
`444`	`444`	`// Fire the jspDestroyedEvent probe event`
`445`	`445`	`if (jspProbeEmitter != null) {`
`446`		`- jspProbeEmitter.jspDestroyedEvent(theServlet);`
	`446`	`+ jspProbeEmitter.jspDestroyedEvent(jspUri);`
`447`	`447`	`}`
`448`	`448`	`}`
`449`	`449`	`}`