diff options
| -rw-r--r-- | VERSION.txt | 1 | ||||
| -rw-r--r-- | jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/VERSION.txt b/VERSION.txt index 754a748d3b..67095a6918 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,4 +1,5 @@ jetty-7.0.0.M4-SNAPSHOT + + 281059 NPE in QTP with debug on jetty-7.0.0.M3 20 June 2009 + fixed race with expired async listeners diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java index 3fcdeda5b3..10289d887c 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java @@ -14,7 +14,6 @@ package org.eclipse.jetty.util.thread; -import java.util.Queue; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; import java.util.concurrent.ConcurrentLinkedQueue; @@ -416,7 +415,7 @@ public class QueuedThreadPool extends AbstractLifeCycle implements ThreadPool, E /* ------------------------------------------------------------ */ public String toString() { - return _name+"{"+getMinThreads()+"<="+getIdleThreads()+"<="+getThreads()+"/"+getMaxThreads()+","+_jobs.size()+"}"; + return _name+"{"+getMinThreads()+"<="+getIdleThreads()+"<="+getThreads()+"/"+getMaxThreads()+","+(_jobs==null?-1:_jobs.size())+"}"; } /* ------------------------------------------------------------ */ |