prussell 01/03/03 15:35:24
Modified: src/org/apache/cocoon Tag: xml-cocoon2
CocoonComponentSelector.java
DefaultComponentManager.java
Log:
Fixed my own stupid mistake in component lifecycle managers.
Revision Changes Path
No revision
No revision
1.1.2.27 +6 -6
xml-cocoon/src/org/apache/cocoon/Attic/CocoonComponentSelector.java
Index: CocoonComponentSelector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/Attic/CocoonComponentSelector.java,v
retrieving revision 1.1.2.26
retrieving revision 1.1.2.27
diff -u -r1.1.2.26 -r1.1.2.27
--- CocoonComponentSelector.java 2001/03/03 16:00:36 1.1.2.26
+++ CocoonComponentSelector.java 2001/03/03 23:35:22 1.1.2.27
@@ -44,7 +44,7 @@
/** Default component manager for Cocoon's non sitemap components.
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Paul Russell</a>
- * @version CVS $Revision: 1.1.2.26 $ $Date: 2001/03/03 16:00:36 $
+ * @version CVS $Revision: 1.1.2.27 $ $Date: 2001/03/03 23:35:22 $
*/
public class CocoonComponentSelector implements Contextualizable,
ComponentSelector, Composer, Configurable, ThreadSafe, Loggable {
protected Logger log;
@@ -260,7 +260,11 @@
}
public void release(Component component) {
- if (component instanceof Disposable) {
+ if (
+ component instanceof Disposable
+ && ! ( component instanceof Poolable )
+ && ! ( component instanceof ThreadSafe)
+ ) {
try {
((Disposable) component).dispose();
} catch (Exception e) {
@@ -269,10 +273,6 @@
e
);
}
- }
-
- if (component instanceof Recyclable) {
- ((Recyclable) component).recycle();
}
if (component instanceof Poolable) {
1.1.2.24 +10 -10
xml-cocoon/src/org/apache/cocoon/Attic/DefaultComponentManager.java
Index: DefaultComponentManager.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/Attic/DefaultComponentManager.java,v
retrieving revision 1.1.2.23
retrieving revision 1.1.2.24
diff -u -r1.1.2.23 -r1.1.2.24
--- DefaultComponentManager.java 2001/03/03 16:00:35 1.1.2.23
+++ DefaultComponentManager.java 2001/03/03 23:35:23 1.1.2.24
@@ -42,7 +42,7 @@
/** Default component manager for Cocoon's non sitemap components.
* @author <a href="mailto:[EMAIL PROTECTED]">Paul Russell</a>
- * @version CVS $Revision: 1.1.2.23 $ $Date: 2001/03/03 16:00:35 $
+ * @version CVS $Revision: 1.1.2.24 $ $Date: 2001/03/03 23:35:23 $
*/
public class DefaultComponentManager implements ComponentManager, Loggable,
Configurable, Contextualizable {
@@ -296,20 +296,20 @@
}
public void release(Component component) {
- if (component instanceof Disposable) {
- try {
+ if (
+ component instanceof Disposable
+ && ! ( component instanceof Poolable )
+ && ! ( component instanceof ThreadSafe)
+ ) {
+ try {
((Disposable) component).dispose();
- } catch ( Exception e ) {
+ } catch (Exception e) {
this.log.warn(
- "Exception while disposing of an instance of " +
component.getClass().getName() + ".",
+ "Could not dispose of instance of component " +
component.getClass().getName() + ".",
e
);
}
- }
-
- if (component instanceof Recyclable) {
- ((Recyclable) component).recycle();
- }
+ }
if (component instanceof Poolable) {
ComponentPool pool = (ComponentPool)
pools.get(component.getClass());
