jyang 2004/03/18 16:07:53
Modified: cornerstone/src/java/org/apache/cornerstone/framework/core
BaseObject.java
Log:
calls only init() in constructor; check for singleton is already done in singleton
manager
PR:
Obtained from:
Submitted by:
Reviewed by:
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.5 +1 -15
jakarta-jetspeed-2/cornerstone/src/java/org/apache/cornerstone/framework/core/BaseObject.java
Index: BaseObject.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/cornerstone/src/java/org/apache/cornerstone/framework/core/BaseObject.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BaseObject.java 16 Mar 2004 01:58:57 -0000 1.4
+++ BaseObject.java 19 Mar 2004 00:07:53 -0000 1.5
@@ -19,9 +19,7 @@
import java.util.*;
import org.apache.cornerstone.framework.api.config.IConfigurable;
import org.apache.cornerstone.framework.api.core.IObject;
-import org.apache.cornerstone.framework.api.singleton.ISingletonManager;
import org.apache.cornerstone.framework.constant.Constant;
-import org.apache.cornerstone.framework.init.Cornerstone;
import org.apache.cornerstone.framework.util.OrderedProperties;
import org.apache.log4j.Logger;
@@ -187,18 +185,6 @@
protected BaseObject()
{
init();
-
- String configIsSingleton =
getConfigProperty(CONFIG_META_INSTANCE_IS_SINGLETON);
- Boolean isSingleton = new Boolean(configIsSingleton);
-
- // does singleton already exist?
- if (isSingleton == Boolean.TRUE)
- {
- ISingletonManager singletonManager = (ISingletonManager)
Cornerstone.getImplementation(ISingletonManager.class);
- Object existingInstance =
singletonManager.getSingleton(getClass().getName());
- if (existingInstance != null)
- throw new RuntimeException("singleton already exists; cannot create
another instance");
- }
}
protected String getClassVariableKey(String name)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
