cziegeler 02/02/11 03:48:46
Modified: src/java/org/apache/cocoon/components
CocoonComponentManager.java
Log:
Fixing releasing of RequestLifecycle components and improved performance (just a
little bit)
Revision Changes Path
1.8 +13 -10
xml-cocoon2/src/java/org/apache/cocoon/components/CocoonComponentManager.java
Index: CocoonComponentManager.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/CocoonComponentManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CocoonComponentManager.java 10 Feb 2002 04:45:20 -0000 1.7
+++ CocoonComponentManager.java 11 Feb 2002 11:48:45 -0000 1.8
@@ -76,7 +76,7 @@
* by a special lifecycle handling for a RequestLifecycleComponent.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: CocoonComponentManager.java,v 1.7 2002/02/10 04:45:20
vgritsenko Exp $
+ * @version CVS $Id: CocoonComponentManager.java,v 1.8 2002/02/11 11:48:45
cziegeler Exp $
*/
public final class CocoonComponentManager
extends ExcaliburComponentManager
@@ -108,7 +108,8 @@
super(manager);
}
- private static Integer ONE = new Integer(1);
+ private static final Integer ONE = new Integer(1);
+ private static final Integer TWO = new Integer(2);
/**
* This hook must be called by the sitemap each time a sitemap is entered
@@ -121,9 +122,7 @@
if ( !stack.empty() ) {
final Object[] objects = (Object[])stack.peek();
if ( objects[1] == objectModel ) {
- stack.push(
- new Object[] {resolver, objectModel, objects[2],
- new Integer(((Integer)objects[3]).intValue()+1)});
+ stack.push(new Object[] {resolver, objectModel, objects[2], TWO});
return;
}
}
@@ -143,7 +142,7 @@
while (iter.hasNext()) {
final Object[] o = (Object[])iter.next();
final Component component = (Component)o[0];
- ((ComponentManager)o[1]).release( component );
+ ((CocoonComponentManager)o[1]).releaseRLComponent( component );
}
}
}
@@ -194,10 +193,8 @@
* Release a Component. This implementation makes sure it has a handle on the
propper
* ComponentHandler, and let's the ComponentHandler take care of the actual
work.
*/
- public void release( final Component component )
- {
- if( null == component )
- {
+ public void release( final Component component ) {
+ if( null == component ) {
return;
}
@@ -207,4 +204,10 @@
super.release( component);
}
+ /**
+ * Release a RequestLifecycleComponent
+ */
+ protected void releaseRLComponent( final Component component ) {
+ super.release( component );
+ }
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
