You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by gi...@apache.org on 2003/04/15 15:10:28 UTC
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components CocoonComponentManager.java
giacomo 2003/04/15 06:10:27
Modified: src/java/org/apache/cocoon/components
CocoonComponentManager.java
Log:
Fixing reload behaviour
Obtained from: Carsten Ziegeler
Submitted by: Carsten Ziegeler
Reviewed by: Giacomo Pati
CVS: ----------------------------------------------------------------------
CVS: PR:
CVS: If this change addresses a PR in the problem report tracking
CVS: database, then enter the PR number(s) here.
CVS: Obtained from:
CVS: If this change has been taken from another system, such as NCSA,
CVS: then name the system in this line, otherwise delete it.
CVS: Submitted by:
CVS: If this code has been contributed to Apache by someone else; i.e.,
CVS: they sent us a patch or a new module, then include their name/email
CVS: address here. If this is your work then delete this line.
CVS: Reviewed by:
CVS: If we are doing pre-commit code reviews and someone else has
CVS: reviewed your changes, include their name(s) here.
CVS: If you have not had it reviewed then delete this line.
Revision Changes Path
1.7 +8 -8 cocoon-2.1/src/java/org/apache/cocoon/components/CocoonComponentManager.java
Index: CocoonComponentManager.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/CocoonComponentManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -b -u -r1.6 -r1.7
--- CocoonComponentManager.java 24 Mar 2003 14:33:54 -0000 1.6
+++ CocoonComponentManager.java 15 Apr 2003 13:10:27 -0000 1.7
@@ -117,21 +117,21 @@
}
/** Create the ComponentManager with a Classloader */
- public CocoonComponentManager( final ClassLoader loader ) {
+ public CocoonComponentManager(final ClassLoader loader) {
super( null, loader );
- if ( null == rootManager ) rootManager = this;
+ rootManager = this;
}
/** Create the ComponentManager with a Classloader and parent ComponentManager */
- public CocoonComponentManager( final ComponentManager manager, final ClassLoader loader ) {
- super(manager, loader);
- if ( null == rootManager ) rootManager = this;
+ public CocoonComponentManager(final ComponentManager manager, final ClassLoader loader) {
+ super( manager, loader );
+ if (rootManager != manager) rootManager = this;
}
/** Create the ComponentManager with a parent ComponentManager */
public CocoonComponentManager(final ComponentManager manager) {
- super(manager);
- if ( null == rootManager ) rootManager = this;
+ super( manager);
+ if (rootManager != manager) rootManager = this;
}
/**