cziegeler 2004/02/20 01:25:02
Modified: fortress/container/src/impl/org/apache/avalon/fortress/impl/lookup
FortressServiceManager.java
FortressServiceSelector.java
Log:
Don't use static bucket map. It seems that it has threading problems, so use a safer
variant.
Revision Changes Path
1.18 +4 -3
avalon/fortress/container/src/impl/org/apache/avalon/fortress/impl/lookup/FortressServiceManager.java
Index: FortressServiceManager.java
===================================================================
RCS file:
/home/cvs/avalon/fortress/container/src/impl/org/apache/avalon/fortress/impl/lookup/FortressServiceManager.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- FortressServiceManager.java 14 May 2003 15:54:46 -0000 1.17
+++ FortressServiceManager.java 20 Feb 2004 09:25:02 -0000 1.18
@@ -57,8 +57,9 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.ServiceSelector;
import org.apache.avalon.framework.service.WrapperServiceSelector;
-import org.apache.commons.collections.StaticBucketMap;
+import java.util.Collections;
+import java.util.HashMap;
import java.util.Map;
/**
@@ -93,7 +94,7 @@
m_parent = parent;
m_container = container;
- m_used = new StaticBucketMap();
+ m_used = Collections.synchronizedMap(new HashMap());
}
public Object lookup( final String role )
1.15 +4 -3
avalon/fortress/container/src/impl/org/apache/avalon/fortress/impl/lookup/FortressServiceSelector.java
Index: FortressServiceSelector.java
===================================================================
RCS file:
/home/cvs/avalon/fortress/container/src/impl/org/apache/avalon/fortress/impl/lookup/FortressServiceSelector.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- FortressServiceSelector.java 28 May 2003 17:50:20 -0000 1.14
+++ FortressServiceSelector.java 20 Feb 2004 09:25:02 -0000 1.15
@@ -53,8 +53,9 @@
import org.apache.avalon.fortress.impl.handler.ComponentHandler;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceSelector;
-import org.apache.commons.collections.StaticBucketMap;
+import java.util.Collections;
+import java.util.HashMap;
import java.util.Map;
/**
@@ -91,7 +92,7 @@
m_key = key;
m_container = container;
- m_used = new StaticBucketMap();
+ m_used = Collections.synchronizedMap(new HashMap());
}
public Object select( final Object hint )
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
