add timeout to blackhole method
Merge branch 'master' of github.com:WillBDaniels/JavaServer