Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jetty-9.4.x-3550-QueuedThreadPool-stalled' into jetty-9.4.x-3550-QueuedThreadPool-cleanup

This commit is contained in:
Greg Wilkins 2019-04-25 06:25:28 +02:00
parent 787380a91e a8b4ee3ed2
commit ad40ba36a8
4 changed files with 73 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
jetty-bom/pom.xml
View File

@ -211,7 +211,22 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-infinispan</artifactId>
<artifactId>infinispan-remote</artifactId>
<version>9.4.17-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>infinispan-remote-query</artifactId>
<version>9.4.17-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>infinispan-embedded</artifactId>
<version>9.4.17-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>infinispan-embedded-query</artifactId>
<version>9.4.17-SNAPSHOT</version>
</dependency>
<dependency>

4
jetty-util/src/main/java/org/eclipse/jetty/util/component/DumpableCollection.java
View File

@ -53,7 +53,7 @@ public class DumpableCollection implements Dumpable
@Override
public void dump(Appendable out, String indent) throws IOException
{
Object[] array = _collection.toArray();
Dumpable.dumpObjects(out,indent,_name + " size="+array.length, array);
Object[] array = (_collection == null ? null : _collection.toArray());
Dumpable.dumpObjects(out,indent,_name + " size="+(array == null ? 0 : array.length), array);
}
}

2
jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java
View File

@ -600,7 +600,7 @@ public class QueuedThreadPool extends ContainerLifeCycle implements SizedThreadP
String knownMethod = "";
for (StackTraceElement t : trace)
{
if ("idleJobPoll".equals(t.getMethodName()) && t.getClassName().endsWith("QueuedThreadPool$Runner"))
if ("idleJobPoll".equals(t.getMethodName()) && t.getClassName().equals(Runner.class.getName()))
{
knownMethod = "IDLE ";
break;

54
jetty-util/src/test/java/org/eclipse/jetty/util/component/DumpableCollectionTest.java Normal file
View File

@ -0,0 +1,54 @@
//
// ========================================================================
// Copyright (c) 1995-2019 Mort Bay Consulting Pty. Ltd.
// ------------------------------------------------------------------------
// All rights reserved. This program and the accompanying materials
// are made available under the terms of the Eclipse Public License v1.0
// and Apache License v2.0 which accompanies this distribution.
//
// The Eclipse Public License is available at
// http://www.eclipse.org/legal/epl-v10.html
//
// The Apache License v2.0 is available at
// http://www.opensource.org/licenses/apache2.0.php
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//
package org.eclipse.jetty.util.component;
import static org.hamcrest.MatcherAssert.assertThat;
import java.util.ArrayList;
import java.util.Collection;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.Test;
public class DumpableCollectionTest
{
@Test
public void testNullDumpableCollection () throws Exception
{
DumpableCollection dc = new DumpableCollection("null test", null);
String dump = dc.dump();
assertThat(dump, Matchers.containsString("size=0"));
}
@Test
public void testNonNullDumpableCollection () throws Exception
{
Collection<String> collection = new ArrayList<>();
collection.add("one");
collection.add("two");
collection.add("three");
DumpableCollection dc = new DumpableCollection("non null test", collection);
String dump = dc.dump();
assertThat(dump, Matchers.containsString("one"));
assertThat(dump, Matchers.containsString("two"));
assertThat(dump, Matchers.containsString("three"));
}
}