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

Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.

This commit is contained in:
Simone Bordet 2019-11-19 10:50:31 +01:00
parent 04b1a77b6d e89e8ae16e
commit 04dc257641
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Jenkinsfile vendored
View File

@ -11,7 +11,7 @@ pipeline {
agent { node { label 'linux' } } agent { node { label 'linux' } }
options { timeout(time: 120, unit: 'MINUTES') } options { timeout(time: 120, unit: 'MINUTES') }
steps { steps {
mavenBuild("jdk11", "-Pmongodb install", "maven3", true) // -Pautobahn mavenBuild("jdk11", "-Pmongodb clean install", "maven3", true) // -Pautobahn
// Collect up the jacoco execution results (only on main build) // Collect up the jacoco execution results (only on main build)
jacoco inclusionPattern: '**/org/eclipse/jetty/**/*.class', jacoco inclusionPattern: '**/org/eclipse/jetty/**/*.class',
exclusionPattern: '' + exclusionPattern: '' +
@ -44,7 +44,7 @@ pipeline {
agent { node { label 'linux' } } agent { node { label 'linux' } }
steps { steps {
timeout(time: 120, unit: 'MINUTES') { timeout(time: 120, unit: 'MINUTES') {
mavenBuild("jdk13", "-Pmongodb install", "maven3", true) mavenBuild("jdk13", "-Pmongodb clean install", "maven3", true)
warnings consoleParsers: [[parserName: 'Maven'], [parserName: 'Java']] warnings consoleParsers: [[parserName: 'Maven'], [parserName: 'Java']]
junit testResults: '**/target/surefire-reports/*.xml,**/target/invoker-reports/TEST*.xml' junit testResults: '**/target/surefire-reports/*.xml,**/target/invoker-reports/TEST*.xml'
} }
@ -65,7 +65,7 @@ pipeline {
agent { node { label 'linux' } } agent { node { label 'linux' } }
steps { steps {
timeout(time: 30, unit: 'MINUTES') { timeout(time: 30, unit: 'MINUTES') {
mavenBuild("jdk11", "install -f build-resources", "maven3", true) mavenBuild("jdk11", "clean install -f build-resources", "maven3", true)
mavenBuild("jdk11", "install checkstyle:check -DskipTests", "maven3", true) mavenBuild("jdk11", "install checkstyle:check -DskipTests", "maven3", true)
recordIssues( recordIssues(
enabledForFailure: true, aggregatingResults: true, enabledForFailure: true, aggregatingResults: true,

2
jetty-client/src/main/java/org/eclipse/jetty/client/AbstractConnectionPool.java
View File

@ -68,7 +68,7 @@ public abstract class AbstractConnectionPool implements ConnectionPool, Dumpable
} }
@ManagedAttribute(value = "The number of pending connections", readonly = true) @ManagedAttribute(value = "The number of pending connections", readonly = true)
public int getPendingCount() public int getPendingConnectionCount()
{ {
return connections.getHi(); return connections.getHi();
} }

3
jetty-client/src/main/java/org/eclipse/jetty/client/DuplexConnectionPool.java
View File

@ -309,9 +309,10 @@ public class DuplexConnectionPool extends AbstractConnectionPool implements Swee
unlock(); unlock();
} }
return String.format("%s@%x[c=%d/%d,a=%d,i=%d]", return String.format("%s@%x[c=%d/%d/%d,a=%d,i=%d]",
getClass().getSimpleName(), getClass().getSimpleName(),
hashCode(), hashCode(),
getPendingConnectionCount(),
getConnectionCount(), getConnectionCount(),
getMaxConnectionCount(), getMaxConnectionCount(),
activeSize, activeSize,

3
jetty-client/src/main/java/org/eclipse/jetty/client/MultiplexConnectionPool.java
View File

@ -265,9 +265,10 @@ public class MultiplexConnectionPool extends AbstractConnectionPool implements C
activeSize = activeConnections.size(); activeSize = activeConnections.size();
idleSize = idleConnections.size(); idleSize = idleConnections.size();
} }
return String.format("%s@%x[connections=%d/%d,multiplex=%d,active=%d,idle=%d]", return String.format("%s@%x[connections=%d/%d/%d,multiplex=%d,active=%d,idle=%d]",
getClass().getSimpleName(), getClass().getSimpleName(),
hashCode(), hashCode(),
getPendingConnectionCount(),
getConnectionCount(), getConnectionCount(),
getMaxConnectionCount(), getMaxConnectionCount(),
getMaxMultiplex(), getMaxMultiplex(),

3
jetty-client/src/main/java/org/eclipse/jetty/client/RoundRobinConnectionPool.java
View File

@ -214,9 +214,10 @@ public class RoundRobinConnectionPool extends AbstractConnectionPool implements
} }
} }
} }
return String.format("%s@%x[c=%d/%d,a=%d]", return String.format("%s@%x[c=%d/%d/%d,a=%d]",
getClass().getSimpleName(), getClass().getSimpleName(),
hashCode(), hashCode(),
getPendingConnectionCount(),
present, present,
getMaxConnectionCount(), getMaxConnectionCount(),
active active

1
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ManagedAttributeListener.java
View File

@ -100,7 +100,6 @@ public class ManagedAttributeListener implements ServletContextListener, Servlet
protected void updateBean(String name, Object oldBean, Object newBean) protected void updateBean(String name, Object oldBean, Object newBean)
{ {
LOG.info("update {} {}->{} on {}", name, oldBean, newBean, _context);
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
LOG.debug("update {} {}->{} on {}", name, oldBean, newBean, _context); LOG.debug("update {} {}->{} on {}", name, oldBean, newBean, _context);
_context.updateBean(oldBean, newBean, false); _context.updateBean(oldBean, newBean, false);