- Port fix for 6646921

Kin Man Chung · Kin Man Chung · commit ba714e0dfb0f · 2009-04-02T20:17:11.000Z
svn path=/trunk/; revision=1066
diff --git a/impl/src/main/java/org/apache/jasper/runtime/TagHandlerPool.java b/impl/src/main/java/org/apache/jasper/runtime/TagHandlerPool.java
@@ -187,6 +187,10 @@ public void reuse(Tag handler) {
         }
         // There is no need for other threads to wait for us to release
         handler.release();
+
+        if (resourceInjector != null) {
+            resourceInjector.preDestroy(handler);
+        }
     }
 
     /**
@@ -196,6 +200,9 @@ public void reuse(Tag handler) {
     public synchronized void release() {
 	for (int i=current; i>=0; i--) {
 	    handlers[i].release();
+            if (resourceInjector != null) {
+                resourceInjector.preDestroy(handlers[i]);
+            }
 	}
     }
 
diff --git a/impl/src/main/java/org/glassfish/jsp/api/ResourceInjector.java b/impl/src/main/java/org/glassfish/jsp/api/ResourceInjector.java
@@ -60,10 +60,21 @@ public interface ResourceInjector {
      * associated with this ResourceInjector into the given tag handler
      * instance. 
      *
+     * <p>Any @PostConstruct methods on the class (and super-classes)
+     * of the instance will be invoked after injection.
+     *
      * @param handler The tag handler instance to be injected
      *
      * @throws Exception if an error occurs during injection
      */
     public void inject(JspTag handler) throws Exception;
 
+    /**
+     * Invokes any @PreDestroy methods defined on the instance's class
+     * (and super-classes).
+     *
+     * @param handler The tag handler instance whose @PreDestroy methods
+     * to call
+     */
+    public void preDestroy(JspTag handler);
 }

Original file line number	Diff line number	Diff line change
`@@ -187,6 +187,10 @@ public void reuse(Tag handler) {`
`187`	`187`	`}`
`188`	`188`	`// There is no need for other threads to wait for us to release`
`189`	`189`	`handler.release();`
	`190`	`+`
	`191`	`+ if (resourceInjector != null) {`
	`192`	`+ resourceInjector.preDestroy(handler);`
	`193`	`+ }`
`190`	`194`	`}`
`191`	`195`
`192`	`196`	`/**`
`@@ -196,6 +200,9 @@ public void reuse(Tag handler) {`
`196`	`200`	`public synchronized void release() {`
`197`	`201`	`for (int i=current; i>=0; i--) {`
`198`	`202`	`handlers[i].release();`
	`203`	`+ if (resourceInjector != null) {`
	`204`	`+ resourceInjector.preDestroy(handlers[i]);`
	`205`	`+ }`
`199`	`206`	`}`
`200`	`207`	`}`
`201`	`208`