From 7918e53d2ba6e4f0baf9a468320dd8151bbf56bf Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Wed, 6 Apr 2011 22:15:56 +0000 Subject: [PATCH] 341850 Protect QTP dump from bad stacks git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2984 7e9141cc-0065-0410-87d8-b60c137991c4 --- VERSION.txt | 1 + .../java/org/eclipse/jetty/util/thread/QueuedThreadPool.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/VERSION.txt b/VERSION.txt index 4df8f5c87d8..764ae022dc0 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -28,6 +28,7 @@ jetty-7.4.0.RC0 + 341736 Split jetty-nested out of war module + 341726 JSONPojoConverter handles characters + 341992 Overlayed context deployer + + 341850 Protect QTP dump from bad stacks + JETTY-1245 Pooled Buffers implementation + JETTY-1354 Added jetty-nested + Ensure generated fragment names are unique 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 444e73fdfb9..be7850bcc01 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 @@ -489,7 +489,7 @@ public class QueuedThreadPool extends AbstractLifeCycle implements ThreadPool, E } else { - dump.add(thread.getId()+" "+thread.getName()+" "+thread.getState()+" @ "+trace[0]+(idle?" IDLE":"")); + dump.add(thread.getId()+" "+thread.getName()+" "+thread.getState()+" @ "+(trace.length>0?trace[0]:"???")+(idle?" IDLE":"")); } }