Use Concurrent instead of synchronized
Do not call getSession by default
increase loggging
Fix merge
Add a timeout test
Fixes #1342
Improve fix for #1342
Clear the listeners when destroy is invoked
Prevent NPE
Improve fix for #1342
Fix the test