portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jy...@apache.org
Subject cvs commit: jakarta-jetspeed-2/cornerstone/src/java/org/apache/cornerstone/framework/core BaseObject.java
Date Tue, 16 Mar 2004 01:58:57 GMT
jyang       2004/03/15 17:58:57

  Modified:    cornerstone/src/java/org/apache/cornerstone/framework/core
                        BaseObject.java
  Log:
  use mini implementation manager of Cornerstone
  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.4       +4 -2      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- BaseObject.java	8 Mar 2004 00:56:33 -0000	1.3
  +++ BaseObject.java	16 Mar 2004 01:58:57 -0000	1.4
  @@ -19,6 +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;
  @@ -193,7 +194,8 @@
           // does singleton already exist?
           if (isSingleton == Boolean.TRUE)
           {
  -        	Object existingInstance = Cornerstone.getSingletonManager().getSingleton(getClass().getName());
  +        	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");
           }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message