weaver 2004/06/23 11:40:33
Modified: portal/src/java/org/apache/jetspeed Jetspeed.java
Log:
more thread-safety added
Revision Changes Path
1.5 +13 -7
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/Jetspeed.java
Index: Jetspeed.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/Jetspeed.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Jetspeed.java 8 Mar 2004 00:35:43 -0000 1.4
+++ Jetspeed.java 23 Jun 2004 18:40:33 -0000 1.5
@@ -55,12 +55,18 @@
{
try
{
- log.info("Jetspeed environment attempting to initialize portal
Engine...");
- engine = new JetspeedEngine();
- engine.init(configuration, applicationRoot, config);
- log.info("JetspeedEngine successfuly intialized.");
- log.info("Jetspeed environment successfuly intialized.");
- return engine;
+ synchronized(Jetspeed.class)
+ {
+ if(engine == null)
+ {
+ log.info("Jetspeed environment attempting to initialize portal
Engine...");
+ engine = new JetspeedEngine();
+ engine.init(configuration, applicationRoot, config);
+ log.info("JetspeedEngine successfuly intialized.");
+ log.info("Jetspeed environment successfuly intialized.");
+ }
+ return engine;
+ }
}
catch (Exception e)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
