some refactoring
Added change note about INITIALIZED
Added change note about INITIALIZED
Use a concurrent map
Make sure all threads are stopped
ConcurrentHashMap can't handle null values. Use a marker object instead
removed incorrectly committed test code