Author: taylor
Date: Thu Feb 15 13:57:24 2007
New Revision: 508183
URL: http://svn.apache.org/viewvc?view=rev&rev=508183
Log:
https://issues.apache.org/jira/browse/JS2-613
reviewed all components for non-synchronized usage of collections
Modified:
portals/jetspeed-2/trunk/components/file-cache/src/java/org/apache/jetspeed/cache/file/FileCache.java
portals/jetspeed-2/trunk/components/locator/src/java/org/apache/jetspeed/locator/JetspeedTemplateLocator.java
portals/jetspeed-2/trunk/components/portal/maven.xml
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/session/PortalSessionsManagerImpl.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/state/impl/JetspeedNavigationalStateComponent.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/ChangePortletAction.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPageAction.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPortletActionsAction.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/userinfo/impl/UserInfoManagerImpl.java
portals/jetspeed-2/trunk/components/portlet-factory/src/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java
portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/rdbms/ojb/ConnectionManagerImpl.java
portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/rdbms/ojb/ConnectionRepositoryEntry.java
portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletentity/PortletEntityImpl.java
portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletregistry/PersistenceBrokerPortletRegistry.java
portals/jetspeed-2/trunk/components/rewriter/src/java/org/apache/jetspeed/rewriter/JetspeedRewriterController.java
portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java
Modified:
portals/jetspeed-2/trunk/components/file-cache/src/java/org/apache/jetspeed/cache/file/FileCache.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/file-cache/src/java/org/apache/jetspeed/cache/file/FileCache.java?view=diff&rev=508183&r1=508182&r2=508183
==============================================================================
---
portals/jetspeed-2/trunk/components/file-cache/src/java/org/apache/jetspeed/cache/file/FileCache.java
(original)
+++
portals/jetspeed-2/trunk/components/file-cache/src/java/org/apache/jetspeed/cache/file/FileCache.java
Thu Feb 15 13:57:24 2007
@@ -57,7 +57,7 @@
*/
public FileCache()
{
- cache = new HashMap();
+ cache = Collections.synchronizedMap(new HashMap());
this.scanner = new FileCacheScanner();
this.scanner.setDaemon(true);
}
@@ -71,7 +71,8 @@
public FileCache(long scanRate,
int maxSize)
{
- cache = new HashMap();
+
+ cache = Collections.synchronizedMap(new HashMap());
this.scanRate = scanRate;
this.maxSize = maxSize;
@@ -92,7 +93,7 @@
long scanRate,
int maxSize)
{
- cache = new HashMap(initialCapacity, loadFactor);
+ cache = Collections.synchronizedMap(new HashMap(initialCapacity,
loadFactor));
this.scanRate = scanRate;
this.maxSize = maxSize;
Modified:
portals/jetspeed-2/trunk/components/locator/src/java/org/apache/jetspeed/locator/JetspeedTemplateLocator.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/locator/src/java/org/apache/jetspeed/locator/JetspeedTemplateLocator.java?view=diff&rev=508183&r1=508182&r2=508183
==============================================================================
---
portals/jetspeed-2/trunk/components/locator/src/java/org/apache/jetspeed/locator/JetspeedTemplateLocator.java
(original)
+++
portals/jetspeed-2/trunk/components/locator/src/java/org/apache/jetspeed/locator/JetspeedTemplateLocator.java
Thu Feb 15 13:57:24 2007
@@ -17,6 +17,7 @@
import java.io.File;
import java.io.FileNotFoundException;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -357,7 +358,7 @@
public void start()
{
- this.templateMap = new HashMap();
+ this.templateMap = Collections.synchronizedMap(new HashMap());
for (int ix = 0; ix < roots.size(); ix++)
{
Modified: portals/jetspeed-2/trunk/components/portal/maven.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/maven.xml?view=diff&rev=508183&r1=508182&r2=508183
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/maven.xml (original)
+++ portals/jetspeed-2/trunk/components/portal/maven.xml Thu Feb 15 13:57:24
2007
@@ -17,6 +17,6 @@
<project default="java:jar" xmlns:j="jelly:core" xmlns:define="jelly:define"
xmlns:maven="jelly:maven">
<!-- Target of maven test:single test -->
- <property name='testcase'
value='org.apache.jetspeed.userinfo.TestUserInfoManager' />
+ <property name='testcase'
value='org.apache.jetspeed.aggregator.TestAggregator' />
</project>
Modified:
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/session/PortalSessionsManagerImpl.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/session/PortalSessionsManagerImpl.java?view=diff&rev=508183&r1=508182&r2=508183
==============================================================================
---
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/session/PortalSessionsManagerImpl.java
(original)
+++
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/session/PortalSessionsManagerImpl.java
Thu Feb 15 13:57:24 2007
@@ -15,8 +15,10 @@
*/
package org.apache.jetspeed.container.session;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.Map;
import javax.servlet.http.HttpSession;
@@ -32,21 +34,21 @@
{
long portalSessionKey;
PortalSessionMonitor psm;
- HashMap sessionMonitors;
+ Map sessionMonitors;
PortalSessionRegistry()
{
- sessionMonitors = new HashMap();
+ sessionMonitors = Collections.synchronizedMap(new HashMap());
}
}
- private long portalSessionKeySequence;
- private HashMap portalSessionsRegistry;
+ private long portalSessionKeySequence;
+ private Map portalSessionsRegistry;
public PortalSessionsManagerImpl()
{
portalSessionKeySequence = System.currentTimeMillis();
- portalSessionsRegistry = new HashMap();
+ portalSessionsRegistry = Collections.synchronizedMap(new HashMap());
}
/* (non-Javadoc)
Modified:
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/state/impl/JetspeedNavigationalStateComponent.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/state/impl/JetspeedNavigationalStateComponent.java?view=diff&rev=508183&r1=508182&r2=508183
==============================================================================
---
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/state/impl/JetspeedNavigationalStateComponent.java
(original)
+++
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/state/impl/JetspeedNavigationalStateComponent.java
Thu Feb 15 13:57:24 2007
@@ -15,6 +15,7 @@
*/
package org.apache.jetspeed.container.state.impl;
+import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
@@ -48,8 +49,8 @@
// maps containing allowed PortletMode and WindowState objects on their
lowercase name
// ensuring only allowed, and always the same objects are returned and
allowing comparision by value
- private final HashMap supportedPortletModes = new HashMap();
- private final HashMap supportedWindowStates = new HashMap();
+ private final HashMap supportedPortletModes =
Collections.synchronizedMap(new HashMap());
+ private final HashMap supportedWindowStates =
Collections.synchronizedMap(new HashMap());
private final static Log log =
LogFactory.getLog(JetspeedNavigationalStateComponent.class);
private BeanFactory beanFactory;
Modified:
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/ChangePortletAction.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/ChangePortletAction.java?view=diff&rev=508183&r1=508182&r2=508183
==============================================================================
---
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/ChangePortletAction.java
(original)
+++
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/ChangePortletAction.java
Thu Feb 15 13:57:24 2007
@@ -33,7 +33,6 @@
import org.apache.jetspeed.layout.PortletActionSecurityBehavior;
import org.apache.jetspeed.om.page.ContentFragment;
import org.apache.jetspeed.om.page.ContentPage;
-import org.apache.jetspeed.om.page.Fragment;
import org.apache.jetspeed.page.PageManager;
import org.apache.jetspeed.request.RequestContext;
import org.apache.pluto.om.window.PortletWindow;
Modified:
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPageAction.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPageAction.java?view=diff&rev=508183&r1=508182&r2=508183
==============================================================================
---
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPageAction.java
(original)
+++
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPageAction.java
Thu Feb 15 13:57:24 2007
@@ -35,7 +35,6 @@
import org.apache.pluto.om.common.Parameter;
import org.apache.pluto.om.common.ParameterSet;
import org.apache.pluto.om.portlet.PortletDefinition;
-import org.apache.pluto.om.common.DisplayName;
/**
* Get Page retrieves a page from the Page Manager store and PSML format
Modified:
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPortletActionsAction.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPortletActionsAction.java?view=diff&rev=508183&r1=508182&r2=508183
==============================================================================
---
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPortletActionsAction.java
(original)
+++
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPortletActionsAction.java
Thu Feb 15 13:57:24 2007
@@ -15,31 +15,21 @@
*/
package org.apache.jetspeed.layout.impl;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.List;
import java.util.ArrayList;
-
-import javax.portlet.PortletMode;
-import javax.portlet.WindowState;
+import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.ajax.AJAXException;
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
-import org.apache.jetspeed.container.state.MutableNavigationalState;
-import org.apache.jetspeed.container.window.PortletWindowAccessor;
-import org.apache.jetspeed.layout.PortletActionSecurityBehavior;
import org.apache.jetspeed.decoration.DecorationValve;
+import org.apache.jetspeed.layout.PortletActionSecurityBehavior;
import org.apache.jetspeed.om.page.ContentFragment;
import org.apache.jetspeed.om.page.ContentPage;
import org.apache.jetspeed.om.page.Fragment;
import org.apache.jetspeed.page.PageManager;
import org.apache.jetspeed.request.RequestContext;
-import org.apache.pluto.om.window.PortletWindow;
/**
* Get Portlet Actions retrieves the current set of valid actions for one or
more portlet windows
Modified:
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/userinfo/impl/UserInfoManagerImpl.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/userinfo/impl/UserInfoManagerImpl.java?view=diff&rev=508183&r1=508182&r2=508183
==============================================================================
---
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/userinfo/impl/UserInfoManagerImpl.java
(original)
+++
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/userinfo/impl/UserInfoManagerImpl.java
Thu Feb 15 13:57:24 2007
@@ -16,29 +16,28 @@
import java.security.Principal;
import java.util.Collection;
-import java.util.Iterator;
+import java.util.Collections;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
-import java.util.prefs.Preferences;
import java.util.prefs.BackingStoreException;
+import java.util.prefs.Preferences;
import javax.portlet.PortletRequest;
import javax.security.auth.Subject;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
-import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
import org.apache.jetspeed.om.common.UserAttributeRef;
+import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
import org.apache.jetspeed.request.RequestContext;
+import org.apache.jetspeed.security.SecurityException;
+import org.apache.jetspeed.security.SecurityHelper;
import org.apache.jetspeed.security.User;
import org.apache.jetspeed.security.UserManager;
import org.apache.jetspeed.security.UserPrincipal;
-import org.apache.jetspeed.security.SecurityException;
-import org.apache.jetspeed.security.SecurityHelper;
import org.apache.jetspeed.userinfo.UserInfoManager;
-
import org.apache.pluto.om.common.ObjectID;
/**
@@ -254,7 +253,7 @@
{
if (null == userInfoMapCache)
{
- userInfoMapCache = new HashMap();
+ userInfoMapCache = Collections.synchronizedMap(new HashMap());
}
}
Modified:
portals/jetspeed-2/trunk/components/portlet-factory/src/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portlet-factory/src/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java?view=diff&rev=508183&r1=508182&r2=508183
==============================================================================
---
portals/jetspeed-2/trunk/components/portlet-factory/src/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java
(original)
+++
portals/jetspeed-2/trunk/components/portlet-factory/src/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java
Thu Feb 15 13:57:24 2007
@@ -67,9 +67,9 @@
{
synchronized (classLoaderMap)
{
- unregisterPortletApplication(pa);
- classLoaderMap.put(pa.getId(), cl);
- }
+ unregisterPortletApplication(pa);
+ classLoaderMap.put(pa.getId(), cl);
+ }
}
public void unregisterPortletApplication(PortletApplication pa)
Modified:
portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/rdbms/ojb/ConnectionManagerImpl.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/rdbms/ojb/ConnectionManagerImpl.java?view=diff&rev=508183&r1=508182&r2=508183
==============================================================================
---
portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/rdbms/ojb/ConnectionManagerImpl.java
(original)
+++
portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/rdbms/ojb/ConnectionManagerImpl.java
Thu Feb 15 13:57:24 2007
@@ -17,7 +17,9 @@
import java.sql.Connection;
import java.sql.SQLException;
+import java.util.Collections;
import java.util.HashMap;
+import java.util.Map;
import org.apache.ojb.broker.OJBRuntimeException;
import org.apache.ojb.broker.PBKey;
@@ -71,7 +73,7 @@
private boolean batchMode;
private BatchConnection batchCon = null;
- private static HashMap connectionFactories = new HashMap();
+ private static Map connectionFactories = Collections.synchronizedMap(new
HashMap());
public ConnectionManagerImpl(PersistenceBroker broker)
{
Modified:
portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/rdbms/ojb/ConnectionRepositoryEntry.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/rdbms/ojb/ConnectionRepositoryEntry.java?view=diff&rev=508183&r1=508182&r2=508183
==============================================================================
---
portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/rdbms/ojb/ConnectionRepositoryEntry.java
(original)
+++
portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/rdbms/ojb/ConnectionRepositoryEntry.java
Thu Feb 15 13:57:24 2007
@@ -20,7 +20,7 @@
import java.sql.DatabaseMetaData;
import java.sql.DriverManager;
import java.sql.SQLException;
-import java.util.HashMap;
+import java.util.Map;
import javax.naming.Context;
import javax.naming.InitialContext;
@@ -41,7 +41,6 @@
import org.apache.ojb.broker.util.ClassHelper;
import org.springframework.beans.factory.BeanNameAware;
import org.springframework.beans.factory.InitializingBean;
-import org.springframework.jdbc.datasource.DriverManagerDataSource;
/**
* A JavaBean that configures an entry in OJB's ConnectionRepository
@@ -293,7 +292,7 @@
connectionFactoryClass =
ConnectionFactoryDBCPImpl.class.getName ();
}
jcd.setDriver(driverClassName);
- HashMap conData = jdbcMetadataUtils.parseConnectionUrl(url);
+ Map conData = jdbcMetadataUtils.parseConnectionUrl(url);
jcd.setDbms(platform);
jcd.setProtocol((String)conData.get(JdbcMetadataUtils.PROPERTY_PROTOCOL));
jcd.setSubProtocol((String)conData.get(JdbcMetadataUtils.PROPERTY_SUBPROTOCOL));
Modified:
portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletentity/PortletEntityImpl.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletentity/PortletEntityImpl.java?view=diff&rev=508183&r1=508182&r2=508183
==============================================================================
---
portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletentity/PortletEntityImpl.java
(original)
+++
portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletentity/PortletEntityImpl.java
Thu Feb 15 13:57:24 2007
@@ -20,7 +20,6 @@
import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
Modified:
portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletregistry/PersistenceBrokerPortletRegistry.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletregistry/PersistenceBrokerPortletRegistry.java?view=diff&rev=508183&r1=508182&r2=508183
==============================================================================
---
portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletregistry/PersistenceBrokerPortletRegistry.java
(original)
+++
portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletregistry/PersistenceBrokerPortletRegistry.java
Thu Feb 15 13:57:24 2007
@@ -66,7 +66,7 @@
private JetspeedCache applicationOidCache = null;
private JetspeedCache portletOidCache = null;
- private Map nameCache = new HashMap();
+ private Map nameCache = new HashMap(); // work in progress (switch to
JetspeedCache)
// for testing purposes only: no need for the portletFactory then
public PersistenceBrokerPortletRegistry(String repositoryPath)
@@ -328,7 +328,7 @@
public void notifyElementRemoved(JetspeedCache cache, Object o)
{
- System.out.println("--- Registry: notification element is a " + o);
+ //System.out.println("--- Registry: notification element is a " + o);
// update nameCache
}
Modified:
portals/jetspeed-2/trunk/components/rewriter/src/java/org/apache/jetspeed/rewriter/JetspeedRewriterController.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/rewriter/src/java/org/apache/jetspeed/rewriter/JetspeedRewriterController.java?view=diff&rev=508183&r1=508182&r2=508183
==============================================================================
---
portals/jetspeed-2/trunk/components/rewriter/src/java/org/apache/jetspeed/rewriter/JetspeedRewriterController.java
(original)
+++
portals/jetspeed-2/trunk/components/rewriter/src/java/org/apache/jetspeed/rewriter/JetspeedRewriterController.java
Thu Feb 15 13:57:24 2007
@@ -17,10 +17,9 @@
import java.io.File;
import java.io.FileReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
import java.io.Reader;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -62,7 +61,7 @@
protected Mapping mapper = null;
/** Collection of rulesets in the system */
- protected Map rulesets = new HashMap();
+ protected Map rulesets = Collections.synchronizedMap(new HashMap());
/** configured basic rewriter class */
protected Class basicRewriterClass = BasicRewriter.class;
Modified:
portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java?view=diff&rev=508183&r1=508182&r2=508183
==============================================================================
---
portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java
(original)
+++
portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java
Thu Feb 15 13:57:24 2007
@@ -26,6 +26,7 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
+import java.util.Collections;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.HashMap;
@@ -139,39 +140,13 @@
this.maxTimeMsToFlush_User = maxTimeMsToFlush_User;
this.maxTimeMsToFlush_Page = maxTimeMsToFlush_Page;
//this.jetspeedDSEntry = jetspeedDSEntry;
- this.ds = dataSource;
- currentUsers = new TreeMap();
+ this.ds = dataSource;
+ currentUsers = Collections.synchronizedMap(new TreeMap());
}
public void springInit() throws NamingException
{
formatter = new SimpleDateFormat("dd/MM/yyyy:hh:mm:ss z");
-
- //if (jetspeedDSEntry != null)
-// if (dataSource != null)
-// {
-// if (jndiLocator.getJndiName() != null)
-// {
-// try
-// {
-// Context initialContext = new InitialContext();
-// ds = (DataSource) initialContext.lookup(jndiLocator
-// .getJndiName());
-// } catch (NamingException e)
-// {
-// e.printStackTrace();
-// throw e;
-// }
-// } else
-// {
-// BasicDataSource bds = new BasicDataSource();
-// bds.setDriverClassName(jetspeedDSEntry.getDriverClassName());
-// bds.setUrl(jetspeedDSEntry.getUrl());
-// bds.setUsername(jetspeedDSEntry.getUsername());
-// bds.setPassword(jetspeedDSEntry.getPassword());
-// ds = (DataSource) bds;
-// }
-// }
currentUserCount = 0;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
