vgritsenko 02/02/09 20:45:20
Modified: src/java/org/apache/cocoon/components
CocoonComponentManager.java
Log:
fix memory leak
Revision Changes Path
1.7 +11 -11
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CocoonComponentManager.java 7 Feb 2002 11:55:18 -0000 1.6
+++ CocoonComponentManager.java 10 Feb 2002 04:45:20 -0000 1.7
@@ -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.6 2002/02/07 11:55:18
cziegeler Exp $
+ * @version CVS $Id: CocoonComponentManager.java,v 1.7 2002/02/10 04:45:20
vgritsenko Exp $
*/
public final class CocoonComponentManager
extends ExcaliburComponentManager
@@ -121,10 +121,10 @@
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],
+ new Integer(((Integer)objects[3]).intValue()+1)});
+ return;
}
}
stack.push(new Object[] {resolver, objectModel, new HashMap(5), ONE});
@@ -163,15 +163,15 @@
final Object[] o = (Object[])components.get(role);
if ( null != o ) {
final Component component = (Component) o[0];
- if ( null != component ) {
+ if (null != component) {
return component;
}
}
}
final Component component = super.lookup( role );
- if ( null != component && component instanceof RequestLifecycleComponent) {
- if ( stack == null || stack.empty() ) {
+ if (null != component && component instanceof RequestLifecycleComponent) {
+ if (stack == null || stack.empty()) {
throw new ComponentException("ComponentManager has no Environment
Stack.");
}
final Object[] objects = (Object[]) stack.peek();
@@ -180,12 +180,12 @@
if (component instanceof Recomposable) {
((Recomposable) component).recompose(this);
}
- ((RequestLifecycleComponent) component).setup(
(SourceResolver)objects[0],
- (Map)objects[1]);
+ ((RequestLifecycleComponent)
component).setup((SourceResolver)objects[0],
+ (Map)objects[1]);
} catch (Exception local) {
throw new ComponentException("Exception during setup of
RequestLifecycleComponent with role '"+role+"'", local);
}
- components.put( role, new Object[] {component, this});
+ components.put(role, new Object[] {component, this});
}
return component;
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
