protocols)
- {
- }
+ /**
+ * Configures the given SSLEngine and the given Connection for ALPN.
+ *
+ * @param sslEngine the SSLEngine to configure
+ * @param connection the Connection to configure
+ * @throws RuntimeException if this processor cannot be configured
+ */
+ public default void configure(SSLEngine sslEngine, Connection connection)
+ {
+ }
- public default void process(SSLEngine sslEngine)
- {
- }
+ /**
+ * Server-side interface used by ServiceLoader.
+ */
+ public interface Server extends ALPNProcessor
+ {
+ }
+
+ /**
+ * Client-side interface used by ServiceLoader.
+ */
+ public interface Client extends ALPNProcessor
+ {
}
}
diff --git a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/LdapLoginModule.java b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/LdapLoginModule.java
index 15ecea9976f..16f45d43ede 100644
--- a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/LdapLoginModule.java
+++ b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/LdapLoginModule.java
@@ -178,11 +178,11 @@ public class LdapLoginModule extends AbstractLoginModule
private DirContext _rootContext;
-
+
public class LDAPUserInfo extends UserInfo
{
- Attributes attributes;
-
+ Attributes attributes;
+
/**
* @param userName
* @param credential
@@ -198,10 +198,10 @@ public class LdapLoginModule extends AbstractLoginModule
{
return getUserRoles(_rootContext, getUserName(), attributes);
}
-
+
}
-
-
+
+
/**
* get the available information about the user
*
@@ -216,7 +216,7 @@ public class LdapLoginModule extends AbstractLoginModule
*/
public UserInfo getUserInfo(String username) throws Exception
{
- Attributes attributes = getUserAttributes(username);
+ Attributes attributes = getUserAttributes(username);
String pwdCredential = getUserCredentials(attributes);
if (pwdCredential == null)
@@ -271,30 +271,32 @@ public class LdapLoginModule extends AbstractLoginModule
*/
private Attributes getUserAttributes(String username) throws LoginException
{
- Attributes attributes = null;
+ Attributes attributes = null;
- SearchResult result;
- try {
- result = findUser(username);
- attributes = result.getAttributes();
- }
- catch (NamingException e) {
+ SearchResult result;
+ try
+ {
+ result = findUser(username);
+ attributes = result.getAttributes();
+ }
+ catch (NamingException e)
+ {
throw new LoginException("Root context binding failure.");
- }
-
- return attributes;
- }
-
+ }
+
+ return attributes;
+ }
+
private String getUserCredentials(Attributes attributes) throws LoginException
{
- String ldapCredential = null;
+ String ldapCredential = null;
Attribute attribute = attributes.get(_userPasswordAttribute);
if (attribute != null)
{
try
{
- byte[] value = (byte[]) attribute.get();
+ byte[] value = (byte[])attribute.get();
ldapCredential = new String(value);
}
@@ -323,16 +325,16 @@ public class LdapLoginModule extends AbstractLoginModule
{
String rdnValue = username;
Attribute attribute = attributes.get(_userRdnAttribute);
- if (attribute != null)
- {
- try
- {
- rdnValue = (String) attribute.get(); // switch to the value stored in the _userRdnAttribute if we can
- }
- catch (NamingException e)
- {
- }
- }
+ if (attribute != null)
+ {
+ try
+ {
+ rdnValue = (String)attribute.get(); // switch to the value stored in the _userRdnAttribute if we can
+ }
+ catch (NamingException e)
+ {
+ }
+ }
String userDn = _userRdnAttribute + "=" + rdnValue + "," + _userBaseDn;
@@ -361,7 +363,7 @@ public class LdapLoginModule extends AbstractLoginModule
while (results.hasMoreElements())
{
- SearchResult result = (SearchResult) results.nextElement();
+ SearchResult result = (SearchResult)results.nextElement();
Attributes attributes = result.getAttributes();
@@ -410,8 +412,8 @@ public class LdapLoginModule extends AbstractLoginModule
Callback[] callbacks = configureCallbacks();
getCallbackHandler().handle(callbacks);
- String webUserName = ((NameCallback) callbacks[0]).getName();
- Object webCredential = ((ObjectCallback) callbacks[1]).getObject();
+ String webUserName = ((NameCallback)callbacks[0]).getName();
+ Object webCredential = ((ObjectCallback)callbacks[1]).getObject();
if (webUserName == null || webCredential == null)
{
@@ -424,8 +426,7 @@ public class LdapLoginModule extends AbstractLoginModule
if (_forceBindingLogin)
{
authed = bindingLogin(webUserName, webCredential);
- }
- else
+ } else
{
// This sets read and the credential
UserInfo userInfo = getUserInfo(webUserName);
@@ -439,7 +440,7 @@ public class LdapLoginModule extends AbstractLoginModule
setCurrentUser(new JAASUserInfo(userInfo));
if (webCredential instanceof String)
- authed = credentialLogin(Credential.getCredential((String) webCredential));
+ authed = credentialLogin(Credential.getCredential((String)webCredential));
else
authed = credentialLogin(webCredential);
}
@@ -494,7 +495,7 @@ public class LdapLoginModule extends AbstractLoginModule
* @param username the user name
* @param password the password
* @return true always
- * @throws LoginException if unable to bind the login
+ * @throws LoginException if unable to bind the login
* @throws NamingException if failure to bind login
*/
public boolean bindingLogin(String username, Object password) throws LoginException, NamingException
@@ -505,15 +506,15 @@ public class LdapLoginModule extends AbstractLoginModule
LOG.info("Attempting authentication: " + userDn);
- Hashtable environment = getEnvironment();
+ Hashtable environment = getEnvironment();
- if ( userDn == null || "".equals(userDn) )
+ if (userDn == null || "".equals(userDn))
{
throw new NamingException("username may not be empty");
}
environment.put(Context.SECURITY_PRINCIPAL, userDn);
// RFC 4513 section 6.3.1, protect against ldap server implementations that allow successful binding on empty passwords
- if ( password == null || "".equals(password))
+ if (password == null || "".equals(password))
{
throw new NamingException("password may not be empty");
}
@@ -542,9 +543,9 @@ public class LdapLoginModule extends AbstractLoginModule
LOG.debug("Searching for user " + username + " with filter: \'" + filter + "\'" + " from base dn: " + _userBaseDn);
Object[] filterArguments = new Object[]{
- _userObjectClass,
- _userIdAttribute,
- username
+ _userObjectClass,
+ _userIdAttribute,
+ username
};
NamingEnumeration results = _rootContext.search(_userBaseDn, filter, filterArguments, ctls);
@@ -556,7 +557,7 @@ public class LdapLoginModule extends AbstractLoginModule
throw new LoginException("User not found.");
}
- return (SearchResult) results.nextElement();
+ return (SearchResult)results.nextElement();
}
@@ -565,37 +566,37 @@ public class LdapLoginModule extends AbstractLoginModule
*
* Called once by JAAS after new instance is created.
*
- * @param subject the subect
+ * @param subject the subect
* @param callbackHandler the callback handler
- * @param sharedState the shared state map
- * @param options the option map
+ * @param sharedState the shared state map
+ * @param options the option map
*/
public void initialize(Subject subject,
CallbackHandler callbackHandler,
- Map sharedState,
- Map options)
+ Map sharedState,
+ Map options)
{
super.initialize(subject, callbackHandler, sharedState, options);
- _hostname = (String) options.get("hostname");
- _port = Integer.parseInt((String) options.get("port"));
- _contextFactory = (String) options.get("contextFactory");
- _bindDn = (String) options.get("bindDn");
- _bindPassword = (String) options.get("bindPassword");
- _authenticationMethod = (String) options.get("authenticationMethod");
+ _hostname = (String)options.get("hostname");
+ _port = Integer.parseInt((String)options.get("port"));
+ _contextFactory = (String)options.get("contextFactory");
+ _bindDn = (String)options.get("bindDn");
+ _bindPassword = (String)options.get("bindPassword");
+ _authenticationMethod = (String)options.get("authenticationMethod");
- _userBaseDn = (String) options.get("userBaseDn");
+ _userBaseDn = (String)options.get("userBaseDn");
- _roleBaseDn = (String) options.get("roleBaseDn");
+ _roleBaseDn = (String)options.get("roleBaseDn");
if (options.containsKey("forceBindingLogin"))
{
- _forceBindingLogin = Boolean.parseBoolean((String) options.get("forceBindingLogin"));
+ _forceBindingLogin = Boolean.parseBoolean((String)options.get("forceBindingLogin"));
}
if (options.containsKey("useLdaps"))
{
- _useLdaps = Boolean.parseBoolean((String) options.get("useLdaps"));
+ _useLdaps = Boolean.parseBoolean((String)options.get("useLdaps"));
}
_userObjectClass = getOption(options, "userObjectClass", _userObjectClass);
@@ -625,7 +626,7 @@ public class LdapLoginModule extends AbstractLoginModule
}
catch (NamingException e)
{
- throw new LoginException( "error closing root context: " + e.getMessage() );
+ throw new LoginException("error closing root context: " + e.getMessage());
}
return super.commit();
@@ -639,13 +640,13 @@ public class LdapLoginModule extends AbstractLoginModule
}
catch (NamingException e)
{
- throw new LoginException( "error closing root context: " + e.getMessage() );
+ throw new LoginException("error closing root context: " + e.getMessage());
}
return super.abort();
}
- private String getOption(Map options, String key, String defaultValue)
+ private String getOption(Map options, String key, String defaultValue)
{
Object value = options.get(key);
@@ -654,7 +655,7 @@ public class LdapLoginModule extends AbstractLoginModule
return defaultValue;
}
- return (String) value;
+ return (String)value;
}
/**
@@ -670,7 +671,7 @@ public class LdapLoginModule extends AbstractLoginModule
if (_hostname != null)
{
- env.put(Context.PROVIDER_URL, (_useLdaps?"ldaps://":"ldap://") + _hostname + (_port==0?"":":"+_port) +"/");
+ env.put(Context.PROVIDER_URL, (_useLdaps ? "ldaps://" : "ldap://") + _hostname + (_port == 0 ? "" : ":" + _port) + "/");
}
if (_authenticationMethod != null)
diff --git a/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java b/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java
index ae0e56f161b..e398841684d 100644
--- a/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java
+++ b/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java
@@ -21,6 +21,7 @@ package org.eclipse.jetty.jmx;
import java.io.IOException;
import java.util.Locale;
import java.util.Map;
+import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.atomic.AtomicInteger;
@@ -46,14 +47,11 @@ public class MBeanContainer implements Container.InheritedListener, Dumpable, De
{
private final static Logger LOG = Log.getLogger(MBeanContainer.class.getName());
private final static ConcurrentMap __unique = new ConcurrentHashMap<>();
-
- public static void resetUnique()
- {
- __unique.clear();
- }
+ private static final Container ROOT = new ContainerLifeCycle();
private final MBeanServer _mbeanServer;
- private final Map _beans = new ConcurrentHashMap<>();
+ private final ConcurrentMap _beans = new ConcurrentHashMap<>();
+ private final ConcurrentMap _mbeans = new ConcurrentHashMap<>();
private String _domain = null;
/**
@@ -64,7 +62,7 @@ public class MBeanContainer implements Container.InheritedListener, Dumpable, De
*/
public ObjectName findMBean(Object object)
{
- return _beans.get(object);
+ return _mbeans.get(object);
}
/**
@@ -75,7 +73,7 @@ public class MBeanContainer implements Container.InheritedListener, Dumpable, De
*/
public Object findBean(ObjectName objectName)
{
- for (Map.Entry entry : _beans.entrySet())
+ for (Map.Entry entry : _mbeans.entrySet())
{
if (entry.getValue().equals(objectName))
return entry.getKey();
@@ -130,9 +128,19 @@ public class MBeanContainer implements Container.InheritedListener, Dumpable, De
if (LOG.isDebugEnabled())
LOG.debug("beanAdded {}->{}", parent, obj);
+ if (obj == null)
+ return;
+
+ if (parent == null)
+ parent = ROOT;
+
+ // Is the bean already tracked ?
+ if (_beans.putIfAbsent(obj, parent) != null)
+ return;
+
// Is there an object name for the parent ?
ObjectName parentObjectName = null;
- if (parent != null)
+ if (parent != ROOT)
{
parentObjectName = findMBean(parent);
if (parentObjectName == null)
@@ -143,10 +151,6 @@ public class MBeanContainer implements Container.InheritedListener, Dumpable, De
}
}
- // Does the mbean already exist ?
- if (obj == null || _beans.containsKey(obj))
- return;
-
try
{
// Create an MBean for the object.
@@ -207,7 +211,7 @@ public class MBeanContainer implements Container.InheritedListener, Dumpable, De
if (LOG.isDebugEnabled())
LOG.debug("Registered {}", objectName);
- _beans.put(obj, objectName);
+ _mbeans.put(obj, objectName);
}
catch (Throwable x)
{
@@ -219,12 +223,17 @@ public class MBeanContainer implements Container.InheritedListener, Dumpable, De
public void beanRemoved(Container parent, Object obj)
{
if (LOG.isDebugEnabled())
- LOG.debug("beanRemoved {}", obj);
+ LOG.debug("beanRemoved {}->{}", parent, obj);
- ObjectName objectName = _beans.remove(obj);
+ if (parent == null)
+ parent = ROOT;
- if (objectName != null)
- unregister(objectName);
+ if (_beans.remove(obj, parent))
+ {
+ ObjectName objectName = _mbeans.remove(obj);
+ if (objectName != null)
+ unregister(objectName);
+ }
}
/**
@@ -248,7 +257,7 @@ public class MBeanContainer implements Container.InheritedListener, Dumpable, De
public void dump(Appendable out, String indent) throws IOException
{
ContainerLifeCycle.dumpObject(out,this);
- ContainerLifeCycle.dump(out, indent, _beans.entrySet());
+ ContainerLifeCycle.dump(out, indent, _mbeans.entrySet());
}
@Override
@@ -260,9 +269,11 @@ public class MBeanContainer implements Container.InheritedListener, Dumpable, De
@Override
public void destroy()
{
- _beans.values().stream()
- .filter(objectName -> objectName != null)
+ _mbeans.values().stream()
+ .filter(Objects::nonNull)
.forEach(this::unregister);
+ _mbeans.clear();
+ _beans.clear();
}
private void unregister(ObjectName objectName)
diff --git a/jetty-jmx/src/test/java/org/eclipse/jetty/jmx/MBeanContainerTest.java b/jetty-jmx/src/test/java/org/eclipse/jetty/jmx/MBeanContainerTest.java
index fae5dc00ae3..691735187b5 100644
--- a/jetty-jmx/src/test/java/org/eclipse/jetty/jmx/MBeanContainerTest.java
+++ b/jetty-jmx/src/test/java/org/eclipse/jetty/jmx/MBeanContainerTest.java
@@ -200,8 +200,8 @@ public class MBeanContainerTest
setUpDestroy();
// when
- mbeanContainer.destroy();
objectName = mbeanContainer.findMBean(managed);
+ mbeanContainer.destroy();
// then
Assert.assertFalse("Unregistered bean - managed", mbeanContainer.getMBeanServer().isRegistered(objectName));
@@ -212,9 +212,9 @@ public class MBeanContainerTest
{
// given
setUpDestroy();
- objectName = mbeanContainer.findMBean(managed);
// when
+ objectName = mbeanContainer.findMBean(managed);
mbeanContainer.getMBeanServer().unregisterMBean(objectName);
// then
@@ -224,4 +224,34 @@ public class MBeanContainerTest
// an exception of type InstanceNotFoundException occurs.
mbeanContainer.destroy();
}
+
+ @Test
+ public void testNonManagedLifecycleNotUnregistered() throws Exception
+ {
+ testNonManagedObjectNotUnregistered(new ContainerLifeCycle());
+ }
+
+ @Test
+ public void testNonManagedPojoNotUnregistered() throws Exception
+ {
+ testNonManagedObjectNotUnregistered(new Object());
+ }
+
+ private void testNonManagedObjectNotUnregistered(Object lifeCycle) throws Exception
+ {
+ ContainerLifeCycle parent = new ContainerLifeCycle();
+ parent.addBean(mbeanContainer);
+
+ ContainerLifeCycle child = new ContainerLifeCycle();
+ parent.addBean(child);
+
+ parent.addBean(lifeCycle, true);
+ child.addBean(lifeCycle, false);
+
+ parent.start();
+
+ parent.removeBean(child);
+
+ Assert.assertNotNull(mbeanContainer.findMBean(lifeCycle));
+ }
}
diff --git a/jetty-memcached/jetty-memcached-sessions/src/main/config/etc/sessions/session-data-cache/xmemcached.xml b/jetty-memcached/jetty-memcached-sessions/src/main/config/etc/sessions/session-data-cache/xmemcached.xml
index 30c71580c6a..60448c0ac06 100644
--- a/jetty-memcached/jetty-memcached-sessions/src/main/config/etc/sessions/session-data-cache/xmemcached.xml
+++ b/jetty-memcached/jetty-memcached-sessions/src/main/config/etc/sessions/session-data-cache/xmemcached.xml
@@ -7,8 +7,8 @@
-
-
-
+
+
@@ -20,7 +20,7 @@
- 100
-
-
+
+
diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationConfiguration.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationConfiguration.java
index 80935a4693f..4c4aef88441 100644
--- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationConfiguration.java
+++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationConfiguration.java
@@ -25,9 +25,11 @@ import java.util.Set;
import javax.servlet.ServletContainerInitializer;
+
import org.eclipse.jetty.annotations.AnnotationParser.Handler;
import org.eclipse.jetty.osgi.boot.OSGiWebInfConfiguration;
import org.eclipse.jetty.osgi.boot.OSGiWebappConstants;
+import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.util.resource.Resource;
@@ -184,6 +186,23 @@ public class AnnotationConfiguration extends org.eclipse.jetty.annotations.Annot
parseBundle(context,parser,webbundle,webbundle);
}
+
+
+
+ /**
+ * @see org.eclipse.jetty.annotations.AnnotationConfiguration#parseWebInfClasses(org.eclipse.jetty.webapp.WebAppContext, org.eclipse.jetty.annotations.AnnotationParser)
+ */
+ @Override
+ public void parseWebInfClasses(WebAppContext context, org.eclipse.jetty.annotations.AnnotationParser parser)
+ throws Exception
+ {
+ Bundle webbundle = (Bundle) context.getAttribute(OSGiWebappConstants.JETTY_OSGI_BUNDLE);
+ String bundleClasspath = (String)webbundle.getHeaders().get(Constants.BUNDLE_CLASSPATH);
+ //only scan WEB-INF/classes if we didn't already scan it with parseWebBundle
+ if (StringUtil.isBlank(bundleClasspath) || !bundleClasspath.contains("WEB-INF/classes"))
+ super.parseWebInfClasses(context, parser);
+ }
+
/**
* Scan a bundle required by the webbundle for servlet annotations
* @param context The webapp context
diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationParser.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationParser.java
index 64668220574..dfa5eeae91e 100644
--- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationParser.java
+++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationParser.java
@@ -203,12 +203,11 @@ public class AnnotationParser extends org.eclipse.jetty.annotations.AnnotationPa
}
//transform into a classname to pass to the resolver
String shortName = name.replace('/', '.').substring(0,name.length()-6);
- if (!isParsed(shortName))
+
+ addParsedClass(shortName, getResource(bundle));
+ try (InputStream classInputStream = classUrl.openStream())
{
- try (InputStream classInputStream = classUrl.openStream())
- {
- scanClass(handlers, getResource(bundle), classInputStream);
- }
+ scanClass(handlers, getResource(bundle), classInputStream);
}
}
}
diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
index bd64e9e6e40..c78488e03f6 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
+++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
@@ -128,7 +128,7 @@ public class TestOSGiUtil
for (Bundle b : bundleContext.getBundles())
{
bundlesIndexedBySymbolicName.put(b.getSymbolicName(), b);
- System.err.println(" " + b.getSymbolicName() + " " + b.getLocation() + " " + b.getVersion()+ " " + b.getState());
+ System.err.println(" " + b.getBundleId()+" "+b.getSymbolicName() + " " + b.getLocation() + " " + b.getVersion()+ " " + b.getState());
}
}
diff --git a/jetty-security/src/test/java/org/eclipse/jetty/security/PropertyUserStoreTest.java b/jetty-security/src/test/java/org/eclipse/jetty/security/PropertyUserStoreTest.java
index 84e8c764b75..3153a3ca3a7 100644
--- a/jetty-security/src/test/java/org/eclipse/jetty/security/PropertyUserStoreTest.java
+++ b/jetty-security/src/test/java/org/eclipse/jetty/security/PropertyUserStoreTest.java
@@ -30,11 +30,17 @@ import java.io.BufferedWriter;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
+import java.io.FilePermission;
import java.io.FileWriter;
+import java.io.IOException;
import java.io.OutputStream;
import java.io.Writer;
+import java.nio.file.Files;
import java.nio.file.Path;
+import java.nio.file.attribute.PosixFilePermission;
+import java.nio.file.attribute.PosixFilePermissions;
import java.util.ArrayList;
+import java.util.EnumSet;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
@@ -139,7 +145,7 @@ public class PropertyUserStoreTest
}
}
- return "jar:file:" + usersJar.getCanonicalPath() + "!/" + entryPath;
+ return "jar:" + usersJar.toURI().toASCIIString() + "!/" + entryPath;
}
private void writeUser(File usersFile)
@@ -205,30 +211,47 @@ public class PropertyUserStoreTest
userCount.awaitCount(3);
}
-
@Test
public void testPropertyUserStoreLoadUpdateUser() throws Exception
{
assumeThat("Skipping on OSX", OS.IS_OSX, is(false));
final UserCount userCount = new UserCount();
final File usersFile = initUsersText();
-
- PropertyUserStore store = new PropertyUserStore();
+ final AtomicInteger loadCount = new AtomicInteger(0);
+ PropertyUserStore store = new PropertyUserStore()
+ {
+ @Override
+ protected void loadUsers() throws IOException
+ {
+ loadCount.incrementAndGet();
+ super.loadUsers();
+ }
+ };
store.setHotReload(true);
store.setConfigFile(usersFile);
-
store.registerUserListener(userCount);
store.start();
userCount.assertThatCount(is(3));
-
- addAdditionalUser(usersFile,"skip: skip, roleA\n");
-
- userCount.awaitCount(4);
-
- assertThat("Failed to retrieve UserIdentity from PropertyUserStore directly", store.getUserIdentity("skip"), notNullValue());
+ assertThat(loadCount.get(),is(1));
+ addAdditionalUser(usersFile,"skip: skip, roleA\n");
+ userCount.awaitCount(4);
+ assertThat(loadCount.get(),is(2));
+ assertThat(store.getUserIdentity("skip"), notNullValue());
+ userCount.assertThatCount(is(4));
+ userCount.assertThatUsers(hasItem("skip"));
+
+ if (OS.IS_LINUX)
+ Files.createFile(testdir.getPath().toRealPath().resolve("unrelated.txt"),
+ PosixFilePermissions.asFileAttribute(EnumSet.noneOf(PosixFilePermission.class)));
+ else
+ Files.createFile(testdir.getPath().toRealPath().resolve("unrelated.txt"));
+
+ Thread.sleep(1100);
+ assertThat(loadCount.get(),is(2));
+
userCount.assertThatCount(is(4));
userCount.assertThatUsers(hasItem("skip"));
}
diff --git a/jetty-server/src/main/config/etc/jetty-connectionlimit.xml b/jetty-server/src/main/config/etc/jetty-connectionlimit.xml
new file mode 100644
index 00000000000..07bd2463d48
--- /dev/null
+++ b/jetty-server/src/main/config/etc/jetty-connectionlimit.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+ This listener applies a limit to the number of connections, which when
+ * exceeded results in a call to {@link AbstractConnector#setAccepting(boolean)}
+ * to prevent further connections being received. It can be applied to an
+ * entire server or to a specific connector.
+ *
+ * @see Connection.Listener
+ */
+@ManagedObject
+public class ConnectionLimit extends AbstractLifeCycle implements Listener
+{
+ private static final Logger LOG = Log.getLogger(ConnectionLimit.class);
+
+ private final Server _server;
+ private final List _connectors = new ArrayList<>();
+ private int _connections;
+ private int _maxConnections;
+ private boolean _accepting = true;
+
+ public ConnectionLimit(int maxConnections, Server server)
+ {
+ _maxConnections = maxConnections;
+ _server = server;
+ }
+
+ public ConnectionLimit(int maxConnections, Connector...connectors)
+ {
+ _maxConnections = maxConnections;
+ _server = null;
+ for (Connector c: connectors)
+ {
+ if (c instanceof AbstractConnector)
+ _connectors.add((AbstractConnector)c);
+ else
+ LOG.warn("Connector {} is not an AbstractConnection. Connections not limited",c);
+ }
+ }
+
+ @ManagedAttribute("The maximum number of connections allowed")
+ public synchronized int getMaxConnections()
+ {
+ return _maxConnections;
+ }
+
+ public synchronized void setMaxConnections(int max)
+ {
+ _maxConnections = max;
+ }
+
+ @ManagedAttribute("The current number of connections ")
+ public synchronized int getConnections()
+ {
+ return _connections;
+ }
+
+ @Override
+ protected synchronized void doStart() throws Exception
+ {
+ if (_server!=null)
+ {
+ for (Connector c: _server.getConnectors())
+ {
+ if (c instanceof AbstractConnector)
+ _connectors.add((AbstractConnector)c);
+ else
+ LOG.warn("Connector {} is not an AbstractConnection. Connections not limited",c);
+ }
+ }
+
+ if (LOG.isDebugEnabled())
+ LOG.debug("ConnectionLimit {} for {}",_maxConnections,_connectors);
+
+ _connections = 0;
+ _accepting = true;
+
+ for (AbstractConnector c : _connectors)
+ c.addBean(this);
+ }
+
+ @Override
+ protected synchronized void doStop() throws Exception
+ {
+ for (AbstractConnector c : _connectors)
+ c.removeBean(this);
+ _connections = 0;
+ if (_server!=null)
+ _connectors.clear();
+ }
+
+ @Override
+ public synchronized void onOpened(Connection connection)
+ {
+ if (LOG.isDebugEnabled())
+ LOG.debug("onOpen {} < {} {}",_connections, _maxConnections, connection);
+ if ( ++_connections >= _maxConnections && _accepting)
+ {
+ _accepting = false;
+ LOG.info("Connection Limit({}) reached for {}",_maxConnections,_connectors);
+ for (AbstractConnector c : _connectors)
+ c.setAccepting(false);
+ }
+ }
+
+ @Override
+ public synchronized void onClosed(Connection connection)
+ {
+ if (LOG.isDebugEnabled())
+ LOG.debug("onClosed {} < {} {}",_connections, _maxConnections, connection);
+ if ( --_connections < _maxConnections && !_accepting)
+ {
+ _accepting = true;
+ LOG.info("Connection Limit({}) cleared for {}",_maxConnections,_connectors);
+ for (AbstractConnector c : _connectors)
+ c.setAccepting(true);
+ }
+ }
+
+}
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/LowResourceMonitor.java b/jetty-server/src/main/java/org/eclipse/jetty/server/LowResourceMonitor.java
index 5a0b9ea6f5e..1ef6d74cbb5 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/LowResourceMonitor.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/LowResourceMonitor.java
@@ -21,6 +21,8 @@ package org.eclipse.jetty.server;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
import java.util.concurrent.Executor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -46,7 +48,7 @@ import org.eclipse.jetty.util.thread.ThreadPool;
* Low resources can be detected by:
*
* - {@link ThreadPool#isLowOnThreads()} if {@link Connector#getExecutor()} is
- * an instance of {@link ThreadPool} and {@link #setMonitorThreads(boolean)} is true.
-
+ * an instance of {@link ThreadPool} and {@link #setMonitorThreads(boolean)} is true.
* - If {@link #setMaxMemory(long)} is non zero then low resources is detected if the JVMs
* {@link Runtime} instance has {@link Runtime#totalMemory()} minus {@link Runtime#freeMemory()}
* greater than {@link #getMaxMemory()}
@@ -60,6 +62,9 @@ import org.eclipse.jetty.util.thread.ThreadPool;
* resources state persists for more than {@link #getMaxLowResourcesTime()}, then the
* {@link #getLowResourcesIdleTimeout()} to all connections again. Once the low resources state is
* cleared, the idle timeout is reset to the connector default given by {@link Connector#getIdleTimeout()}.
+ *
+ * If {@link #setAcceptingInLowResources(boolean)} is set to true, then no new connections are accepted
+ * when in low resources state.
*/
@ManagedObject ("Monitor for low resource conditions and activate a low resource mode if detected")
public class LowResourceMonitor extends AbstractLifeCycle
@@ -68,6 +73,7 @@ public class LowResourceMonitor extends AbstractLifeCycle
private final Server _server;
private Scheduler _scheduler;
private Connector[] _monitoredConnectors;
+ private Set _acceptingConnectors = new HashSet<>();
private int _period=1000;
private int _maxConnections;
private long _maxMemory;
@@ -78,6 +84,7 @@ public class LowResourceMonitor extends AbstractLifeCycle
private String _cause;
private String _reasons;
private long _lowStarted;
+ private boolean _acceptingInLowResources = true;
private final Runnable _monitor = new Runnable()
{
@@ -134,6 +141,17 @@ public class LowResourceMonitor extends AbstractLifeCycle
_monitoredConnectors = monitoredConnectors.toArray(new Connector[monitoredConnectors.size()]);
}
+ @ManagedAttribute("If false, new connections are not accepted while in low resources")
+ public boolean isAcceptingInLowResources()
+ {
+ return _acceptingInLowResources;
+ }
+
+ public void setAcceptingInLowResources(boolean acceptingInLowResources)
+ {
+ _acceptingInLowResources = acceptingInLowResources;
+ }
+
@ManagedAttribute("The monitor period in ms")
public int getPeriod()
{
@@ -329,6 +347,15 @@ public class LowResourceMonitor extends AbstractLifeCycle
{
for(Connector connector : getMonitoredOrServerConnectors())
{
+ if (connector instanceof AbstractConnector)
+ {
+ AbstractConnector c = (AbstractConnector)connector;
+ if (c.isAccepting())
+ {
+ _acceptingConnectors.add(c);
+ c.setAccepting(false);
+ }
+ }
for (EndPoint endPoint : connector.getConnectedEndPoints())
endPoint.setIdleTimeout(_lowResourcesIdleTimeout);
}
@@ -341,6 +368,12 @@ public class LowResourceMonitor extends AbstractLifeCycle
for (EndPoint endPoint : connector.getConnectedEndPoints())
endPoint.setIdleTimeout(connector.getIdleTimeout());
}
+
+ for (AbstractConnector connector : _acceptingConnectors)
+ {
+ connector.setAccepting(true);
+ }
+ _acceptingConnectors.clear();
}
private String low(String reasons, String newReason)
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/NegotiatingServerConnection.java b/jetty-server/src/main/java/org/eclipse/jetty/server/NegotiatingServerConnection.java
index cb45294f410..8df5f42d0d0 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/NegotiatingServerConnection.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/NegotiatingServerConnection.java
@@ -55,27 +55,27 @@ public abstract class NegotiatingServerConnection extends AbstractConnection
this.engine = engine;
}
- protected List getProtocols()
+ public List getProtocols()
{
return protocols;
}
- protected String getDefaultProtocol()
+ public String getDefaultProtocol()
{
return defaultProtocol;
}
- protected Connector getConnector()
+ public Connector getConnector()
{
return connector;
}
- protected SSLEngine getSSLEngine()
+ public SSLEngine getSSLEngine()
{
return engine;
}
- protected String getProtocol()
+ public String getProtocol()
{
return protocol;
}
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/NegotiatingServerConnectionFactory.java b/jetty-server/src/main/java/org/eclipse/jetty/server/NegotiatingServerConnectionFactory.java
index 2fbbb64094d..2abdec1a8f8 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/NegotiatingServerConnectionFactory.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/NegotiatingServerConnectionFactory.java
@@ -32,28 +32,6 @@ import org.eclipse.jetty.io.ssl.SslConnection;
public abstract class NegotiatingServerConnectionFactory extends AbstractConnectionFactory
{
- public static void checkProtocolNegotiationAvailable()
- {
- try
- {
- String javaVersion = System.getProperty("java.version");
- String alpnClassName = "org.eclipse.jetty.alpn.ALPN";
- if (javaVersion.startsWith("1."))
- {
- Class klass = ClassLoader.getSystemClassLoader().loadClass(alpnClassName);
- if (klass.getClassLoader() != null)
- throw new IllegalStateException(alpnClassName + " must be on JVM boot classpath");
- }
- else
- {
- NegotiatingServerConnectionFactory.class.getClassLoader().loadClass(alpnClassName);
- }
- }
- catch (ClassNotFoundException x)
- {
- throw new IllegalStateException("No ALPN classes available");
- }
- }
private final List negotiatedProtocols;
private String defaultProtocol;
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
index f8066c69604..f6c4f9728aa 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
@@ -2244,7 +2244,7 @@ public class Request implements HttpServletRequest
event.setDispatchContext(getServletContext());
String uri = ((HttpServletRequest)servletRequest).getRequestURI();
- if (uri.startsWith(_contextPath))
+ if (_contextPath!=null && uri.startsWith(_contextPath))
uri = uri.substring(_contextPath.length());
else
// TODO probably need to strip encoded context from requestURI, but will do this for now:
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
index 20878dd6bea..9e39f3d22a4 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
@@ -402,11 +402,7 @@ public class Server extends HandlerWrapper implements Attributes
acceptors += abstractConnector.getAcceptors();
if (connector instanceof ServerConnector)
- {
- // The SelectorManager uses 2 threads for each selector,
- // one for the normal and one for the low priority strategies.
- selectors += 2 * ((ServerConnector)connector).getSelectorManager().getSelectorCount();
- }
+ selectors += ((ServerConnector)connector).getSelectorManager().getSelectorCount();
}
}
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
index 9b5f4ca3e38..11a40c6dffd 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
@@ -109,7 +109,8 @@ public class ResourceHandler extends HandlerWrapper implements ResourceFactory,W
{
Context scontext = ContextHandler.getCurrentContext();
_context = (scontext == null?null:scontext.getContextHandler());
- _mimeTypes = _context == null?new MimeTypes():_context.getMimeTypes();
+ if (_mimeTypes==null)
+ _mimeTypes = _context == null?new MimeTypes():_context.getMimeTypes();
_resourceService.setContentFactory(new ResourceContentFactory(this,_mimeTypes,_resourceService.getPrecompressedFormats()));
_resourceService.setWelcomeFactory(this);
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java
index 9e6c6a74da1..1041411005a 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java
@@ -22,6 +22,7 @@ import java.io.File;
import java.io.IOException;
import java.util.Arrays;
import java.util.EnumSet;
+import java.util.ListIterator;
import java.util.Set;
import java.util.zip.Deflater;
@@ -495,22 +496,27 @@ public class GzipHandler extends HandlerWrapper implements GzipFactory
}
// Special handling for etags
- String etag = baseRequest.getHttpFields().get(HttpHeader.IF_NONE_MATCH);
- if (etag!=null)
+ for (ListIterator fields = baseRequest.getHttpFields().listIterator(); fields.hasNext();)
{
- int i=etag.indexOf(CompressedContentFormat.GZIP._etagQuote);
- if (i>0)
+ HttpField field = fields.next();
+ if (field.getHeader()==HttpHeader.IF_NONE_MATCH || field.getHeader()==HttpHeader.IF_MATCH)
{
- baseRequest.setAttribute("o.e.j.s.h.gzip.GzipHandler.etag",etag);
- while (i>=0)
+ String etag = field.getValue();
+ int i=etag.indexOf(CompressedContentFormat.GZIP._etagQuote);
+ if (i>0)
{
- etag=etag.substring(0,i)+etag.substring(i+CompressedContentFormat.GZIP._etag.length());
- i=etag.indexOf(CompressedContentFormat.GZIP._etagQuote,i);
- }
- baseRequest.getHttpFields().put(new HttpField(HttpHeader.IF_NONE_MATCH,etag));
+ baseRequest.setAttribute("o.e.j.s.h.gzip.GzipHandler.etag",etag);
+ while (i>=0)
+ {
+ etag=etag.substring(0,i)+etag.substring(i+CompressedContentFormat.GZIP._etag.length());
+ i=etag.indexOf(CompressedContentFormat.GZIP._etagQuote,i);
+ }
+
+ fields.set(new HttpField(field.getHeader(),etag));
+ }
}
}
-
+
HttpOutput.Interceptor orig_interceptor = out.getInterceptor();
try
{
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionCache.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionCache.java
index 4f72e7e8f8e..b34eaf3cf3d 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionCache.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionCache.java
@@ -628,7 +628,7 @@ public abstract class AbstractSessionCache extends ContainerLifeCycle implements
{
boolean dsdel = _sessionDataStore.delete(id);
- if (LOG.isDebugEnabled()) LOG.debug("Session {} deleted in db {}",id, dsdel);
+ if (LOG.isDebugEnabled()) LOG.debug("Session {} deleted in session data store {}",id, dsdel);
}
//delete it from the session object store
@@ -656,7 +656,7 @@ public abstract class AbstractSessionCache extends ContainerLifeCycle implements
return Collections.emptySet();
if (LOG.isDebugEnabled())
- LOG.debug("SessionDataStore checking expiration on {}", candidates);
+ LOG.debug("{} checking expiration on {}", this, candidates);
Set allCandidates = _sessionDataStore.getExpired(candidates);
Set sessionsInUse = new HashSet<>();
if (allCandidates != null)
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/HouseKeeper.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/HouseKeeper.java
index 73b35d564cf..f294be51288 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/HouseKeeper.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/HouseKeeper.java
@@ -261,7 +261,7 @@ public class HouseKeeper extends AbstractLifeCycle
return;
if (LOG.isDebugEnabled())
- LOG.debug("Scavenging sessions");
+ LOG.debug("{} scavenging sessions", this);
//find the session managers
for (SessionHandler manager:_sessionIdManager.getSessionHandlers())
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/Session.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/Session.java
index 859736992a6..84ff111678d 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/Session.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/Session.java
@@ -137,7 +137,7 @@ public class Session implements SessionHandler.SessionIf
// True if:
// 1. the session is still valid
// BUT if passivated out to disk, do we really want this timer to keep going off?
- try (Lock lock = _lock.lockIfNotHeld())
+ try (Lock lock = _lock.lock())
{
return isValid() && isResident();
}
@@ -198,7 +198,7 @@ public class Session implements SessionHandler.SessionIf
*/
public long getRequests()
{
- try (Lock lock = _lock.lockIfNotHeld())
+ try (Lock lock = _lock.lock())
{
return _requests;
}
@@ -217,7 +217,7 @@ public class Session implements SessionHandler.SessionIf
/* ------------------------------------------------------------- */
protected void cookieSet()
{
- try (Lock lock = _lock.lockIfNotHeld())
+ try (Lock lock = _lock.lock())
{
_sessionData.setCookieSet(_sessionData.getAccessed());
}
@@ -225,7 +225,7 @@ public class Session implements SessionHandler.SessionIf
/* ------------------------------------------------------------ */
protected boolean access(long time)
{
- try (Lock lock = _lock.lockIfNotHeld())
+ try (Lock lock = _lock.lock())
{
if (!isValid())
return false;
@@ -249,7 +249,7 @@ public class Session implements SessionHandler.SessionIf
/* ------------------------------------------------------------ */
protected void complete()
{
- try (Lock lock = _lock.lockIfNotHeld())
+ try (Lock lock = _lock.lock())
{
_requests--;
}
@@ -265,7 +265,7 @@ public class Session implements SessionHandler.SessionIf
*/
protected boolean isExpiredAt(long time)
{
- try (Lock lock = _lock.lockIfNotHeld())
+ try (Lock lock = _lock.lock())
{
return _sessionData.isExpiredAt(time);
}
@@ -281,7 +281,7 @@ public class Session implements SessionHandler.SessionIf
protected boolean isIdleLongerThan (int sec)
{
long now = System.currentTimeMillis();
- try (Lock lock = _lock.lockIfNotHeld())
+ try (Lock lock = _lock.lock())
{
return ((_sessionData.getAccessed() + (sec*1000)) <= now);
}
@@ -384,7 +384,7 @@ public class Session implements SessionHandler.SessionIf
/* ------------------------------------------------------------ */
public boolean isValid()
{
- try (Lock lock = _lock.lockIfNotHeld())
+ try (Lock lock = _lock.lock())
{
return _state==State.VALID;
}
@@ -394,7 +394,7 @@ public class Session implements SessionHandler.SessionIf
/* ------------------------------------------------------------- */
public long getCookieSetTime()
{
- try (Lock lock = _lock.lockIfNotHeld())
+ try (Lock lock = _lock.lock())
{
return _sessionData.getCookieSet();
}
@@ -405,7 +405,7 @@ public class Session implements SessionHandler.SessionIf
@Override
public long getCreationTime() throws IllegalStateException
{
- try (Lock lock = _lock.lockIfNotHeld())
+ try (Lock lock = _lock.lock())
{
checkValidForRead();
return _sessionData.getCreated();
@@ -420,7 +420,7 @@ public class Session implements SessionHandler.SessionIf
@Override
public String getId()
{
- try (Lock lock = _lock.lockIfNotHeld())
+ try (Lock lock = _lock.lock())
{
return _sessionData.getId();
}
@@ -450,7 +450,7 @@ public class Session implements SessionHandler.SessionIf
@Override
public long getLastAccessedTime()
{
- try (Lock lock = _lock.lockIfNotHeld())
+ try (Lock lock = _lock.lock())
{
return _sessionData.getLastAccessed();
}
@@ -473,7 +473,7 @@ public class Session implements SessionHandler.SessionIf
@Override
public void setMaxInactiveInterval(int secs)
{
- try (Lock lock = _lock.lockIfNotHeld())
+ try (Lock lock = _lock.lock())
{
_sessionData.setMaxInactiveMs((long)secs*1000L);
_sessionData.calcAndSetExpiry();
@@ -496,7 +496,7 @@ public class Session implements SessionHandler.SessionIf
*/
public void updateInactivityTimer ()
{
- try (Lock lock = _lock.lockIfNotHeld())
+ try (Lock lock = _lock.lock())
{
if (LOG.isDebugEnabled())LOG.debug("updateInactivityTimer");
@@ -556,7 +556,7 @@ public class Session implements SessionHandler.SessionIf
*/
public void stopInactivityTimer ()
{
- try (Lock lock = _lock.lockIfNotHeld())
+ try (Lock lock = _lock.lock())
{
if (_sessionInactivityTimer != null)
{
@@ -573,7 +573,7 @@ public class Session implements SessionHandler.SessionIf
@Override
public int getMaxInactiveInterval()
{
- try (Lock lock = _lock.lockIfNotHeld())
+ try (Lock lock = _lock.lock())
{
return (int)(_sessionData.getMaxInactiveMs()/1000);
}
@@ -653,7 +653,7 @@ public class Session implements SessionHandler.SessionIf
@Override
public Object getAttribute(String name)
{
- try (Lock lock = _lock.lockIfNotHeld())
+ try (Lock lock = _lock.lock())
{
checkValidForRead();
return _sessionData.getAttribute(name);
@@ -667,7 +667,7 @@ public class Session implements SessionHandler.SessionIf
@Deprecated
public Object getValue(String name)
{
- try (Lock lock = _lock.lockIfNotHeld())
+ try (Lock lock = _lock.lock())
{
return _sessionData.getAttribute(name);
}
@@ -679,7 +679,7 @@ public class Session implements SessionHandler.SessionIf
@Override
public Enumeration getAttributeNames()
{
- try (Lock lock = _lock.lockIfNotHeld())
+ try (Lock lock = _lock.lock())
{
checkValidForRead();
final Iterator itor = _sessionData.getKeys().iterator();
@@ -730,7 +730,7 @@ public class Session implements SessionHandler.SessionIf
@Override
public String[] getValueNames() throws IllegalStateException
{
- try (Lock lock = _lock.lockIfNotHeld())
+ try (Lock lock = _lock.lock())
{
checkValidForRead();
Iterator itor = _sessionData.getKeys().iterator();
@@ -751,7 +751,7 @@ public class Session implements SessionHandler.SessionIf
public void setAttribute(String name, Object value)
{
Object old=null;
- try (Lock lock = _lock.lockIfNotHeld())
+ try (Lock lock = _lock.lock())
{
//if session is not valid, don't accept the set
checkValidForWrite();
@@ -812,7 +812,7 @@ public class Session implements SessionHandler.SessionIf
String id = null;
String extendedId = null;
- try (Lock lock = _lock.lockIfNotHeld())
+ try (Lock lock = _lock.lock())
{
checkValidForWrite(); //don't renew id on a session that is not valid
id = _sessionData.getId(); //grab the values as they are now
@@ -820,7 +820,7 @@ public class Session implements SessionHandler.SessionIf
}
String newId = _handler._sessionIdManager.renewSessionId(id, extendedId, request);
- try (Lock lock = _lock.lockIfNotHeld())
+ try (Lock lock = _lock.lock())
{
checkValidForWrite();
_sessionData.setId(newId);
@@ -877,7 +877,7 @@ public class Session implements SessionHandler.SessionIf
*/
public Lock lockIfNotHeld ()
{
- return _lock.lockIfNotHeld();
+ return _lock.lock();
}
/* ------------------------------------------------------------- */
@@ -888,7 +888,7 @@ public class Session implements SessionHandler.SessionIf
{
boolean result = false;
- try (Lock lock = _lock.lockIfNotHeld())
+ try (Lock lock = _lock.lock())
{
switch (_state)
{
@@ -934,7 +934,7 @@ public class Session implements SessionHandler.SessionIf
*/
protected void finishInvalidate() throws IllegalStateException
{
- try (Lock lock = _lock.lockIfNotHeld())
+ try (Lock lock = _lock.lock())
{
try
{
@@ -970,7 +970,7 @@ public class Session implements SessionHandler.SessionIf
@Override
public boolean isNew() throws IllegalStateException
{
- try (Lock lock = _lock.lockIfNotHeld())
+ try (Lock lock = _lock.lock())
{
checkValidForRead();
return _newSession;
@@ -982,7 +982,7 @@ public class Session implements SessionHandler.SessionIf
/* ------------------------------------------------------------- */
public void setIdChanged(boolean changed)
{
- try (Lock lock = _lock.lockIfNotHeld())
+ try (Lock lock = _lock.lock())
{
_idChanged=changed;
}
@@ -992,7 +992,7 @@ public class Session implements SessionHandler.SessionIf
/* ------------------------------------------------------------- */
public boolean isIdChanged ()
{
- try (Lock lock = _lock.lockIfNotHeld())
+ try (Lock lock = _lock.lock())
{
return _idChanged;
}
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java
index eed33686245..5ddb073d03c 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java
@@ -1265,7 +1265,7 @@ public class SessionHandler extends ScopedHandler
Set candidates = new HashSet(Arrays.asList(ss));
_candidateSessionIdsForExpiry.removeAll(candidates);
if (LOG.isDebugEnabled())
- LOG.debug("Scavenging session ids {}", candidates);
+ LOG.debug("{} scavenging session ids {}", this, candidates);
try
{
candidates = _sessionCache.checkExpiration(candidates);
diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
index abb038f07dc..67ddd847f7b 100644
--- a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
+++ b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
@@ -384,9 +384,15 @@ public abstract class HttpServerTestBase extends HttpServerTestFixture
os.flush();
// Read the response.
- String response = readResponse(client);
-
- Assert.assertThat(response, Matchers.containsString("HTTP/1.1 431 "));
+ try
+ {
+ String response = readResponse(client);
+ Assert.assertThat(response, Matchers.containsString("HTTP/1.1 431 "));
+ }
+ catch(Exception e)
+ {
+ // TODO evaluate why we sometimes get an early close on this test
+ }
}
}
diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/LowResourcesMonitorTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/LowResourcesMonitorTest.java
index 085551b1dfd..971d42c697a 100644
--- a/jetty-server/src/test/java/org/eclipse/jetty/server/LowResourcesMonitorTest.java
+++ b/jetty-server/src/test/java/org/eclipse/jetty/server/LowResourcesMonitorTest.java
@@ -31,6 +31,7 @@ import java.util.concurrent.CountDownLatch;
import org.eclipse.jetty.toolchain.test.AdvancedRunner;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.eclipse.jetty.util.thread.TimerScheduler;
+import org.hamcrest.Matchers;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -118,6 +119,51 @@ public class LowResourcesMonitorTest
}
+ @Test
+ public void testNotAccepting() throws Exception
+ {
+ _lowResourcesMonitor.setAcceptingInLowResources(false);
+ Thread.sleep(1200);
+ _threadPool.setMaxThreads(_threadPool.getThreads()-_threadPool.getIdleThreads()+10);
+ Thread.sleep(1200);
+ Assert.assertFalse(_lowResourcesMonitor.isLowOnResources());
+
+ for (AbstractConnector c : _server.getBeans(AbstractConnector.class))
+ assertThat(c.isAccepting(),Matchers.is(true));
+
+ final CountDownLatch latch = new CountDownLatch(1);
+ for (int i=0;i<100;i++)
+ {
+ _threadPool.execute(new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ try
+ {
+ latch.await();
+ }
+ catch (InterruptedException e)
+ {
+ e.printStackTrace();
+ }
+ }
+ });
+ }
+
+ Thread.sleep(1200);
+ Assert.assertTrue(_lowResourcesMonitor.isLowOnResources());
+ for (AbstractConnector c : _server.getBeans(AbstractConnector.class))
+ assertThat(c.isAccepting(),Matchers.is(false));
+
+ latch.countDown();
+ Thread.sleep(1200);
+ Assert.assertFalse(_lowResourcesMonitor.isLowOnResources());
+ for (AbstractConnector c : _server.getBeans(AbstractConnector.class))
+ assertThat(c.isAccepting(),Matchers.is(true));
+ }
+
+
@Ignore ("not reliable")
@Test
public void testLowOnMemory() throws Exception
@@ -155,18 +201,18 @@ public class LowResourcesMonitorTest
Thread.sleep(1200);
Assert.assertTrue(_lowResourcesMonitor.isLowOnResources());
- Socket newSocket = new Socket("localhost",_connector.getLocalPort());
-
- // wait for low idle time to close sockets, but not new Socket
- Thread.sleep(1200);
- Assert.assertFalse(_lowResourcesMonitor.isLowOnResources());
+ try(Socket newSocket = new Socket("localhost",_connector.getLocalPort()))
+ {
+ // wait for low idle time to close sockets, but not new Socket
+ Thread.sleep(1200);
+ Assert.assertFalse(_lowResourcesMonitor.isLowOnResources());
- for (int i=0;i map = request.getParameterMap();
+ // should have thrown a BadMessageException
+ return false;
+ }
+ };
+
+ //Send a request with query string with illegal hex code to cause
+ //an exception parsing the params
+ String request="GET /?test_%e0%x8%81=missing HTTP/1.1\r\n"+
+ "Host: whatever\r\n"+
+ "Content-Type: text/html;charset=utf8\n"+
+ "Connection: close\n"+
+ "\n";
+
+ String responses=_connector.getResponse(request);
+ assertThat("Responses", responses, startsWith("HTTP/1.1 400"));
+ }
+
@Test
public void testEmptyHeaders() throws Exception
{
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/BaseBuilder.java b/jetty-start/src/main/java/org/eclipse/jetty/start/BaseBuilder.java
index 75224b399c8..6348b7a022e 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/BaseBuilder.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/BaseBuilder.java
@@ -20,7 +20,6 @@ package org.eclipse.jetty.start;
import java.io.IOException;
import java.net.URI;
-import java.nio.file.CopyOption;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
@@ -30,12 +29,11 @@ import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
-import org.eclipse.jetty.start.Props.Prop;
import org.eclipse.jetty.start.builders.StartDirBuilder;
import org.eclipse.jetty.start.builders.StartIniBuilder;
import org.eclipse.jetty.start.fileinits.BaseHomeFileInitializer;
-import org.eclipse.jetty.start.fileinits.MavenLocalRepoFileInitializer;
import org.eclipse.jetty.start.fileinits.LocalFileInitializer;
+import org.eclipse.jetty.start.fileinits.MavenLocalRepoFileInitializer;
import org.eclipse.jetty.start.fileinits.TestFileInitializer;
import org.eclipse.jetty.start.fileinits.UriFileInitializer;
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/FileInitializer.java b/jetty-start/src/main/java/org/eclipse/jetty/start/FileInitializer.java
index 7650affa1fb..4f9ecf469fa 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/FileInitializer.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/FileInitializer.java
@@ -29,7 +29,6 @@ import java.nio.file.Path;
import java.nio.file.StandardOpenOption;
import java.util.HashSet;
import java.util.Set;
-import java.util.stream.Stream;
/**
* Interface for initializing a file resource.
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/JavaVersion.java b/jetty-start/src/main/java/org/eclipse/jetty/start/JavaVersion.java
index 59b667500bb..5fe87ac85e0 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/JavaVersion.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/JavaVersion.java
@@ -21,8 +21,14 @@ package org.eclipse.jetty.start;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+/**
+ * Java Version Utility class.
+ * Parses java versions to extract a consistent set of version parts
+ */
public class JavaVersion
{
+ // Copy of code in jetty-util
+
private static final Pattern PRE_JDK9 = Pattern.compile("1\\.(\\d)(\\.(\\d+)(_(\\d+))?)?(-.+)?");
// Regexp from JEP 223 (http://openjdk.java.net/jeps/223).
private static final Pattern JDK9 = Pattern.compile("(\\d+)(\\.(\\d+))?(\\.(\\d+))?((-.+)?(\\+(\\d+)?(-.+)?)?)");
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/StartIni.java b/jetty-start/src/main/java/org/eclipse/jetty/start/StartIni.java
index ee18cf084e2..179411fb425 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/StartIni.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/StartIni.java
@@ -18,7 +18,6 @@
package org.eclipse.jetty.start;
-import java.io.BufferedWriter;
import java.io.IOException;
import java.io.PrintWriter;
import java.nio.charset.StandardCharsets;
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/builders/StartDirBuilder.java b/jetty-start/src/main/java/org/eclipse/jetty/start/builders/StartDirBuilder.java
index ff5a219e1a0..c18008389c0 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/builders/StartDirBuilder.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/builders/StartDirBuilder.java
@@ -20,7 +20,6 @@ package org.eclipse.jetty.start.builders;
import java.io.BufferedWriter;
import java.io.IOException;
-import java.io.PrintWriter;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/fileinits/UriFileInitializer.java b/jetty-start/src/main/java/org/eclipse/jetty/start/fileinits/UriFileInitializer.java
index 0898c2d11ba..c223b557cac 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/fileinits/UriFileInitializer.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/fileinits/UriFileInitializer.java
@@ -19,18 +19,12 @@
package org.eclipse.jetty.start.fileinits;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
import java.net.URI;
import java.nio.file.Files;
import java.nio.file.Path;
-import java.nio.file.StandardOpenOption;
import org.eclipse.jetty.start.BaseHome;
-import org.eclipse.jetty.start.FS;
import org.eclipse.jetty.start.FileInitializer;
-import org.eclipse.jetty.start.StartLog;
public class UriFileInitializer extends FileInitializer
{
diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java
index 67e342086ff..fe74a333e32 100644
--- a/jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java
+++ b/jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java
@@ -28,9 +28,9 @@ import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
+import org.eclipse.jetty.toolchain.test.IO;
import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
import org.eclipse.jetty.toolchain.test.TestTracker;
-import org.eclipse.jetty.toolchain.test.IO;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/ModulesTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/ModulesTest.java
index da29578295c..d7dd86af765 100644
--- a/jetty-start/src/test/java/org/eclipse/jetty/start/ModulesTest.java
+++ b/jetty-start/src/test/java/org/eclipse/jetty/start/ModulesTest.java
@@ -18,6 +18,11 @@
package org.eclipse.jetty.start;
+import static org.hamcrest.Matchers.anyOf;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.assertThat;
+
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
@@ -32,11 +37,6 @@ import org.eclipse.jetty.toolchain.test.TestingDir;
import org.junit.Rule;
import org.junit.Test;
-import static org.hamcrest.Matchers.anyOf;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
-
public class ModulesTest
{
private final static String TEST_SOURCE = "";
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/JavaVersion.java b/jetty-util/src/main/java/org/eclipse/jetty/util/JavaVersion.java
new file mode 100644
index 00000000000..6dd630251ec
--- /dev/null
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/JavaVersion.java
@@ -0,0 +1,166 @@
+//
+// ========================================================================
+// Copyright (c) 1995-2017 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;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Java Version Utility class.
+ * Parses java versions to extract a consistent set of version parts
+ */
+public class JavaVersion
+{
+ // Copy of version in jetty-start
+
+ private static final Pattern PRE_JDK9 = Pattern.compile("1\\.(\\d)(\\.(\\d+)(_(\\d+))?)?(-.+)?");
+ // Regexp from JEP 223 (http://openjdk.java.net/jeps/223).
+ private static final Pattern JDK9 = Pattern.compile("(\\d+)(\\.(\\d+))?(\\.(\\d+))?((-.+)?(\\+(\\d+)?(-.+)?)?)");
+
+ public static final JavaVersion VERSION = parse(System.getProperty("java.version"));
+
+ public static JavaVersion parse(String version)
+ {
+ if (version.startsWith("1."))
+ return parsePreJDK9(version);
+ return parseJDK9(version);
+ }
+
+ private static JavaVersion parsePreJDK9(String version)
+ {
+ Matcher matcher = PRE_JDK9.matcher(version);
+ if (!matcher.matches())
+ throw new IllegalArgumentException("Invalid Java version " + version);
+ int major = 1;
+ int minor = Integer.parseInt(matcher.group(1));
+ String microGroup = matcher.group(3);
+ int micro = microGroup == null || microGroup.isEmpty() ? 0 : Integer.parseInt(microGroup);
+ String updateGroup = matcher.group(5);
+ int update = updateGroup == null || updateGroup.isEmpty() ? 0 : Integer.parseInt(updateGroup);
+ String suffix = matcher.group(6);
+ return new JavaVersion(version, minor, major, minor, micro, update, suffix);
+ }
+
+ private static JavaVersion parseJDK9(String version)
+ {
+ Matcher matcher = JDK9.matcher(version);
+ if (!matcher.matches())
+ throw new IllegalArgumentException("Invalid Java version " + version);
+ int major = Integer.parseInt(matcher.group(1));
+ String minorGroup = matcher.group(3);
+ int minor = minorGroup == null || minorGroup.isEmpty() ? 0 : Integer.parseInt(minorGroup);
+ String microGroup = matcher.group(5);
+ int micro = microGroup == null || microGroup.isEmpty() ? 0 : Integer.parseInt(microGroup);
+ String suffix = matcher.group(6);
+ return new JavaVersion(version, major, major, minor, micro, 0, suffix);
+ }
+
+ private final String version;
+ private final int platform;
+ private final int major;
+ private final int minor;
+ private final int micro;
+ private final int update;
+ private final String suffix;
+
+ private JavaVersion(String version, int platform, int major, int minor, int micro, int update, String suffix)
+ {
+ this.version = version;
+ this.platform = platform;
+ this.major = major;
+ this.minor = minor;
+ this.micro = micro;
+ this.update = update;
+ this.suffix = suffix;
+ }
+
+ /**
+ * @return the string from which this JavaVersion was created
+ */
+ public String getVersion()
+ {
+ return version;
+ }
+
+ /**
+ * Returns the Java Platform version, such as {@code 8} for JDK 1.8.0_92 and {@code 9} for JDK 9.2.4.
+ *
+ * @return the Java Platform version
+ */
+ public int getPlatform()
+ {
+ return platform;
+ }
+
+ /**
+ * Returns the major number version, such as {@code 1} for JDK 1.8.0_92 and {@code 9} for JDK 9.2.4.
+ *
+ * @return the major number version
+ */
+ public int getMajor()
+ {
+ return major;
+ }
+
+ /**
+ * Returns the minor number version, such as {@code 8} for JDK 1.8.0_92 and {@code 2} for JDK 9.2.4.
+ *
+ * @return the minor number version
+ */
+ public int getMinor()
+ {
+ return minor;
+ }
+
+ /**
+ * Returns the micro number version, such as {@code 0} for JDK 1.8.0_92 and {@code 4} for JDK 9.2.4.
+ *
+ * @return the micro number version
+ */
+ public int getMicro()
+ {
+ return micro;
+ }
+
+ /**
+ * Returns the update number version, such as {@code 92} for JDK 1.8.0_92 and {@code 0} for JDK 9.2.4.
+ *
+ * @return the update number version
+ */
+ public int getUpdate()
+ {
+ return update;
+ }
+
+ /**
+ * Returns the remaining string after the version numbers, such as {@code -internal} for
+ * JDK 1.8.0_92-internal and {@code -ea} for JDK 9-ea, or {@code +13} for JDK 9.2.4+13.
+ *
+ * @return the remaining string after the version numbers
+ */
+ public String getSuffix()
+ {
+ return suffix;
+ }
+
+ public String toString()
+ {
+ return version;
+ }
+}
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/MultiReleaseJarFile.java b/jetty-util/src/main/java/org/eclipse/jetty/util/MultiReleaseJarFile.java
new file mode 100644
index 00000000000..a8720cefdf4
--- /dev/null
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/MultiReleaseJarFile.java
@@ -0,0 +1,250 @@
+//
+// ========================================================================
+// Copyright (c) 1995-2017 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;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+import java.util.jar.Manifest;
+import java.util.stream.Stream;
+
+/**
+ * Utility class to handle a Multi Release Jar file
+ */
+public class MultiReleaseJarFile
+{
+ private static final String META_INF_VERSIONS = "META-INF/versions/";
+
+ private final JarFile jarFile;
+ private final int majorVersion;
+ private final boolean multiRelease;
+
+ /* Map to hold unversioned name to VersionedJarEntry */
+ private final Map entries;
+
+ /**
+ * Construct a multi release jar file for the current JVM version, ignoring directories.
+ * @param file The file to open
+ */
+ public MultiReleaseJarFile(File file) throws IOException
+ {
+ this(file,JavaVersion.VERSION.getMajor(),false);
+ }
+
+ /**
+ * Construct a multi release jar file
+ * @param file The file to open
+ * @param majorVersion The major JVM version to apply when selecting a version.
+ * @param includeDirectories true if any directory entries should not be ignored
+ * @throws IOException if the jar file cannot be read
+ */
+ public MultiReleaseJarFile(File file, int majorVersion, boolean includeDirectories) throws IOException
+ {
+ if (file==null || !file.exists() || !file.canRead() || file.isDirectory())
+ throw new IllegalArgumentException("bad jar file: "+file);
+
+ jarFile = new JarFile(file,true,JarFile.OPEN_READ);
+ this.majorVersion = majorVersion;
+
+ Manifest manifest = jarFile.getManifest();
+ if (manifest==null)
+ multiRelease = false;
+ else
+ multiRelease = Boolean.valueOf(String.valueOf(manifest.getMainAttributes().getValue("Multi-Release")));
+
+ Map map = new TreeMap<>();
+ jarFile.stream()
+ .map(VersionedJarEntry::new)
+ .filter(e->(includeDirectories||!e.isDirectory()) && e.isApplicable())
+ .forEach(e->map.compute(e.name, (k, v) -> v==null || v.isReplacedBy(e) ? e : v));
+
+ for (Iterator> i = map.entrySet().iterator();i.hasNext();)
+ {
+ Map.Entry e = i.next();
+ VersionedJarEntry entry = e.getValue();
+
+ if (entry.inner)
+ {
+ VersionedJarEntry outer = map.get(entry.outer);
+
+ if (entry.outer==null || outer.version!= entry.version)
+ i.remove();
+ }
+ }
+
+ entries = Collections.unmodifiableMap(map);
+ }
+
+ /**
+ * @return true IFF the jar is a multi release jar
+ */
+ public boolean isMultiRelease()
+ {
+ return multiRelease;
+ }
+
+ /**
+ * @return The major version applied to this jar for the purposes of selecting entries
+ */
+ public int getVersion()
+ {
+ return majorVersion;
+ }
+
+ /**
+ * @return A stream of versioned entries from the jar, excluded any that are not applicable
+ */
+ public Stream stream()
+ {
+ return entries.values().stream();
+ }
+
+ /** Get a versioned resource entry by name
+ * @param name The unversioned name of the resource
+ * @return The versioned entry of the resource
+ */
+ public VersionedJarEntry getEntry(String name)
+ {
+ return entries.get(name);
+ }
+
+ @Override
+ public String toString()
+ {
+ return String.format("%s[%b,%d]",jarFile.getName(),isMultiRelease(),getVersion());
+ }
+
+ /**
+ * A versioned Jar entry
+ */
+ public class VersionedJarEntry
+ {
+ final JarEntry entry;
+ final String name;
+ final int version;
+ final boolean inner;
+ final String outer;
+
+ VersionedJarEntry(JarEntry entry)
+ {
+ int v = 0;
+ String name = entry.getName();
+ if (name.startsWith(META_INF_VERSIONS))
+ {
+ v = -1;
+ int index = name.indexOf('/', META_INF_VERSIONS.length());
+ if (index > META_INF_VERSIONS.length() && index < name.length())
+ {
+ try
+ {
+ v = TypeUtil.parseInt(name, META_INF_VERSIONS.length(), index - META_INF_VERSIONS.length(), 10);
+ name = name.substring(index + 1);
+ }
+ catch (NumberFormatException x)
+ {
+ throw new RuntimeException("illegal version in "+jarFile,x);
+ }
+ }
+ }
+
+ this.entry = entry;
+ this.name = name;
+ this.version = v;
+ this.inner = name.contains("$") && name.toLowerCase().endsWith(".class");
+ this.outer = inner ? name.substring(0, name.indexOf('$')) + name.substring(name.length() - 6, name.length()) : null;
+ }
+
+ /**
+ * @return the unversioned name of the resource
+ */
+ public String getName()
+ {
+ return name;
+ }
+
+ /**
+ * @return The name of the resource within the jar, which could be versioned
+ */
+ public String getNameInJar()
+ {
+ return entry.getName();
+ }
+
+ /**
+ * @return The version of the resource or 0 for a base version
+ */
+ public int getVersion()
+ {
+ return version;
+ }
+
+ /**
+ *
+ * @return True iff the entry is not from the base version
+ */
+ public boolean isVersioned()
+ {
+ return version > 0;
+ }
+
+ /**
+ *
+ * @return True iff the entry is a directory
+ */
+ public boolean isDirectory()
+ {
+ return entry.isDirectory();
+ }
+
+ /**
+ * @return An input stream of the content of the versioned entry.
+ * @throws IOException if something goes wrong!
+ */
+ public InputStream getInputStream() throws IOException
+ {
+ return jarFile.getInputStream(entry);
+ }
+
+ boolean isApplicable()
+ {
+ if (multiRelease)
+ return this.version>=0 && this.version <= majorVersion && name.length()>0;
+ return this.version==0;
+ }
+
+ boolean isReplacedBy(VersionedJarEntry entry)
+ {
+ if (isDirectory())
+ return entry.version==0;
+ return this.name.equals(entry.name) && entry.version>version;
+ }
+
+ @Override
+ public String toString()
+ {
+ return String.format("%s->%s[%d]",name,entry.getName(),version);
+ }
+ }
+}
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/PathWatcher.java b/jetty-util/src/main/java/org/eclipse/jetty/util/PathWatcher.java
index d4adb9e03a7..9e9c0c32d1c 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/PathWatcher.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/PathWatcher.java
@@ -28,19 +28,15 @@ import java.lang.reflect.Field;
import java.nio.file.ClosedWatchServiceException;
import java.nio.file.FileSystem;
import java.nio.file.FileSystems;
-import java.nio.file.FileVisitResult;
import java.nio.file.Files;
-import java.nio.file.LinkOption;
import java.nio.file.Path;
import java.nio.file.PathMatcher;
-import java.nio.file.SimpleFileVisitor;
import java.nio.file.WatchEvent;
-import java.nio.file.WatchEvent.Kind;
import java.nio.file.WatchKey;
import java.nio.file.WatchService;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.util.AbstractSet;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
import java.util.Collections;
import java.util.EventListener;
import java.util.HashMap;
@@ -51,7 +47,6 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Scanner;
-import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.TimeUnit;
import java.util.function.Predicate;
@@ -71,7 +66,7 @@ import org.eclipse.jetty.util.log.Logger;
*/
public class PathWatcher extends AbstractLifeCycle implements Runnable
{
- public static class Config
+ public static class Config implements Predicate
{
public static final int UNLIMITED_DEPTH = -9999;
@@ -87,22 +82,64 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
PATTERN_SEP = sep;
}
- protected final Path dir;
+ protected final Config parent;
+ protected final Path path;
protected final IncludeExcludeSet includeExclude;
protected int recurseDepth = 0; // 0 means no sub-directories are scanned
protected boolean excludeHidden = false;
+ protected long pauseUntil;
public Config(Path path)
{
- this(path,new IncludeExcludeSet<>(PathMatcherSet.class));
+ this(path,null);
}
- public Config(Path path, IncludeExcludeSet includeExclude)
+ public Config(Path path, Config parent)
{
- this.dir = path;
- this.includeExclude = includeExclude;
+ this.parent = parent;
+ this.includeExclude = parent==null ? new IncludeExcludeSet<>(PathMatcherSet.class) : parent.includeExclude;
+
+ Path dir = path;
+ if (!Files.exists(path))
+ throw new IllegalStateException("Path does not exist: "+path);
+
+ if (!Files.isDirectory(path))
+ {
+ dir = path.getParent();
+ includeExclude.include(new ExactPathMatcher(path));
+ setRecurseDepth(0);
+ }
+
+ this.path = dir;
}
+ public Config getParent()
+ {
+ return parent;
+ }
+
+ public void setPauseUntil(long time)
+ {
+ if (time>pauseUntil)
+ pauseUntil=time;
+ }
+
+ public boolean isPaused(long now)
+ {
+ if (pauseUntil==0)
+ return false;
+ if (pauseUntil>now)
+ {
+ if (LOG.isDebugEnabled())
+ LOG.debug("PAUSED {}",this);
+ return true;
+ }
+ if (LOG.isDebugEnabled())
+ LOG.debug("unpaused {}",this);
+ pauseUntil = 0;
+ return false;
+ }
+
/**
* Add an exclude PathMatcher
*
@@ -126,10 +163,8 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
public void addExclude(final String syntaxAndPattern)
{
if (LOG.isDebugEnabled())
- {
LOG.debug("Adding exclude: [{}]",syntaxAndPattern);
- }
- addExclude(dir.getFileSystem().getPathMatcher(syntaxAndPattern));
+ addExclude(path.getFileSystem().getPathMatcher(syntaxAndPattern));
}
/**
@@ -151,7 +186,7 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
*/
public void addExcludeGlobRelative(String pattern)
{
- addExclude(toGlobPattern(dir,pattern));
+ addExclude(toGlobPattern(path,pattern));
}
/**
@@ -166,9 +201,6 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
LOG.debug("Adding hidden files and directories to exclusions");
}
excludeHidden = true;
-
- addExclude("regex:^.*" + PATTERN_SEP + "\\..*$"); // ignore hidden files
- addExclude("regex:^.*" + PATTERN_SEP + "\\..*" + PATTERN_SEP + ".*$"); // ignore files in hidden directories
}
}
@@ -211,7 +243,7 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
{
LOG.debug("Adding include: [{}]",syntaxAndPattern);
}
- addInclude(dir.getFileSystem().getPathMatcher(syntaxAndPattern));
+ addInclude(path.getFileSystem().getPathMatcher(syntaxAndPattern));
}
/**
@@ -233,7 +265,7 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
*/
public void addIncludeGlobRelative(String pattern)
{
- addInclude(toGlobPattern(dir,pattern));
+ addInclude(toGlobPattern(path,pattern));
}
/**
@@ -262,16 +294,17 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
*/
public Config asSubConfig(Path dir)
{
- Config subconfig = new Config(dir,includeExclude);
- if (dir == this.dir)
- subconfig.recurseDepth = this.recurseDepth; // TODO shouldn't really do a subconfig for this
+ Config subconfig = new Config(dir,this);
+ if (dir == this.path)
+ throw new IllegalStateException("sub "+dir.toString()+" of "+this);
+
+ if (this.recurseDepth == UNLIMITED_DEPTH)
+ subconfig.recurseDepth = UNLIMITED_DEPTH;
else
- {
- if (this.recurseDepth == UNLIMITED_DEPTH)
- subconfig.recurseDepth = UNLIMITED_DEPTH;
- else
- subconfig.recurseDepth = this.recurseDepth - (dir.getNameCount() - this.dir.getNameCount());
- }
+ subconfig.recurseDepth = this.recurseDepth - (dir.getNameCount() - this.path.getNameCount());
+
+ if (LOG.isDebugEnabled())
+ LOG.debug("subconfig {} of {}",subconfig,path);
return subconfig;
}
@@ -287,46 +320,52 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
public Path getPath ()
{
- return this.dir;
+ return this.path;
}
- @Deprecated
- public boolean isExcluded(Path dir) throws IOException
+ public Path resolve(Path path)
{
- if (excludeHidden)
+ if (Files.isDirectory(this.path))
+ return this.path.resolve(path);
+ if (Files.exists(this.path))
+ return this.path;
+ return path;
+ }
+
+ public boolean test(Path path)
+ {
+ if (excludeHidden && isHidden(path))
{
- if (Files.isHidden(dir))
+ if (LOG.isDebugEnabled())
+ LOG.debug("test({}) -> [Hidden]", toShortPath(path));
+ return false;
+ }
+
+ if (!path.startsWith(this.path))
+ {
+ if (LOG.isDebugEnabled())
+ LOG.debug("test({}) -> [!child {}]", toShortPath(path), this.path);
+ return false;
+ }
+
+ if (recurseDepth!=UNLIMITED_DEPTH)
+ {
+ int depth = path.getNameCount() - this.path.getNameCount() - 1;
+
+ if (depth>recurseDepth)
{
- if (NOISY_LOG.isDebugEnabled())
- {
- NOISY_LOG.debug("isExcluded [Hidden] on {}",dir);
- }
- return true;
+ if (LOG.isDebugEnabled())
+ LOG.debug("test({}) -> [depth {}>{}]",toShortPath(path),depth,recurseDepth);
+ return false;
}
}
- boolean matched = ((PathMatcherSet)includeExclude.getExcluded()).test(dir);
- if (NOISY_LOG.isDebugEnabled())
- {
- NOISY_LOG.debug("isExcluded [{}] on {}",matched,dir);
- }
- return matched;
- }
+ boolean matched = includeExclude.test(path);
- @Deprecated
- public boolean isIncluded(Path dir)
- {
- boolean matched = ((PathMatcherSet)includeExclude.getIncluded()).test(dir);
- if (NOISY_LOG.isDebugEnabled())
- {
- NOISY_LOG.debug("isIncluded [{}] on {}",matched,dir);
- }
- return matched;
- }
+ if (LOG.isDebugEnabled())
+ LOG.debug("test({}) -> {}", toShortPath(path), matched);
- public boolean matches(Path path)
- {
- return includeExclude.test(path);
+ return matched;
}
/**
@@ -342,32 +381,6 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
this.recurseDepth = depth;
}
-
-
- /**
- * Determine if the provided child directory should be recursed into based on the configured {@link #setRecurseDepth(int)}
- *
- * @param child
- * the child directory to test against
- * @return true if recurse should occur, false otherwise
- */
- public boolean shouldRecurseDirectory(Path child)
- {
- if (!child.startsWith(dir))
- {
- // not part of parent? don't recurse
- return false;
- }
-
- //If not limiting depth, should recurse all
- if (isRecurseDepthUnlimited())
- return true;
-
- //Depth limited, check it
- int childDepth = dir.relativize(child).getNameCount();
- return (childDepth <= recurseDepth);
- }
-
private String toGlobPattern(Path path, String subPattern)
{
StringBuilder s = new StringBuilder();
@@ -379,9 +392,9 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
Path root = path.getRoot();
if (root != null)
{
- if (NOISY_LOG.isDebugEnabled())
+ if (LOG.isDebugEnabled())
{
- NOISY_LOG.debug("Path: {} -> Root: {}",path,root);
+ LOG.debug("Path: {} -> Root: {}", path, root);
}
for (char c : root.toString().toCharArray())
{
@@ -434,116 +447,76 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
return s.toString();
}
+
+ DirAction handleDir(Path path)
+ {
+ try
+ {
+ if (!Files.isDirectory(path))
+ return DirAction.IGNORE;
+ if (excludeHidden && isHidden(path))
+ return DirAction.IGNORE;
+ if (getRecurseDepth()==0)
+ return DirAction.WATCH;
+ return DirAction.ENTER;
+ }
+ catch(Exception e)
+ {
+ LOG.ignore(e);
+ return DirAction.IGNORE;
+ }
+ }
+
+ public boolean isHidden(Path path)
+ {
+ try
+ {
+ if (!path.startsWith(this.path))
+ return true;
+ for (int i=this.path.getNameCount(); i 0)
- {
- s.append(" [depth=").append(recurseDepth).append("]");
- }
+ s.append(path).append(" [depth=");
+ if (recurseDepth==UNLIMITED_DEPTH)
+ s.append("UNLIMITED");
+ else
+ s.append(recurseDepth);
+ s.append(']');
return s.toString();
}
+
}
- public static class DepthLimitedFileVisitor extends SimpleFileVisitor
+
+ public static enum DirAction
{
- private Config base;
- private PathWatcher watcher;
-
- public DepthLimitedFileVisitor (PathWatcher watcher, Config base)
- {
- this.base = base;
- this.watcher = watcher;
- }
-
- /*
- * 2 situations:
- *
- * 1. a subtree exists at the time a dir to watch is added (eg watching /tmp/xxx and it contains aaa/)
- * - will start with /tmp/xxx for which we want to register with the poller
- * - want to visit each child
- * - if child is file, gen add event
- * - if child is dir, gen add event but ONLY register it if inside depth limit and ONLY continue visit of child if inside depth limit
- * 2. a subtree is added inside a watched dir (eg watching /tmp/xxx, add aaa/ to xxx/)
- * - will start with /tmp/xxx/aaa
- * - gen add event but ONLY register it if inside depth limit and ONLY continue visit of children if inside depth limit
- *
- */
- @Override
- public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException
- {
- //In a directory:
- // 1. the dir is the base directory
- // - register it with the poll mechanism
- // - generate pending add event (iff notifiable and matches patterns)
- // - continue the visit (sibling dirs, sibling files)
- // 2. the dir is a subdir at some depth in the basedir's tree
- // - if the level of the subdir less or equal to base's limit
- // - register it wih the poll mechanism
- // - generate pending add event (iff notifiable and matches patterns)
- // - else stop visiting this dir
-
- if (!base.isExcluded(dir))
- {
- if (base.isIncluded(dir))
- {
- if (watcher.isNotifiable())
- {
- // Directory is specifically included in PathMatcher, then
- // it should be notified as such to interested listeners
- PathWatchEvent event = new PathWatchEvent(dir,PathWatchEventType.ADDED);
- if (LOG.isDebugEnabled())
- {
- LOG.debug("Pending {}",event);
- }
- watcher.addToPendingList(dir, event);
- }
- }
-
- //Register the dir with the watcher if it is:
- // - the base dir and recursion is unlimited
- // - the base dir and its depth is 0 (meaning we want to capture events from it, but not necessarily its children)
- // - the base dir and we are recursing it and the depth is within the limit
- // - a child dir and its depth is within the limits
- if ((base.getPath().equals(dir) && (base.isRecurseDepthUnlimited() || base.getRecurseDepth() >= 0)) || base.shouldRecurseDirectory(dir))
- watcher.register(dir,base);
- }
-
- //Continue walking the tree of this dir if it is:
- // - the base dir and recursion is unlimited
- // - the base dir and we're not recursing in it
- // - the base dir and we are recursing it and the depth is within the limit
- // - a child dir and its depth is within the limits
- if ((base.getPath().equals(dir)&& (base.isRecurseDepthUnlimited() || base.getRecurseDepth() >= 0)) || base.shouldRecurseDirectory(dir))
- return FileVisitResult.CONTINUE;
- else
- return FileVisitResult.SKIP_SUBTREE;
- }
-
- @Override
- public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException
- {
- // In a file:
- // - register with poll mechanism
- // - generate pending add event (iff notifiable and matches patterns)
-
- if (base.matches(file) && watcher.isNotifiable())
- {
- PathWatchEvent event = new PathWatchEvent(file,PathWatchEventType.ADDED);
- if (LOG.isDebugEnabled())
- {
- LOG.debug("Pending {}",event);
- }
- watcher.addToPendingList(file, event);
- }
-
- return FileVisitResult.CONTINUE;
- }
-
+ IGNORE, WATCH, ENTER;
}
-
+
/**
* Listener for path change events
*/
@@ -561,30 +534,38 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
{
void onPathWatchEvents(List events);
}
-
+
/**
* PathWatchEvent
*
* Represents a file event. Reported to registered listeners.
*/
- public static class PathWatchEvent
+ public class PathWatchEvent
{
private final Path path;
private final PathWatchEventType type;
- private int count = 0;
+ private final Config config;
+ long checked;
+ long modified;
+ long length;
- public PathWatchEvent(Path path, PathWatchEventType type)
+ public PathWatchEvent(Path path, PathWatchEventType type, Config config)
{
this.path = path;
- this.count = 1;
this.type = type;
-
+ this.config = config;
+ checked = TimeUnit.NANOSECONDS.toMillis(System.nanoTime());
+ check();
}
- public PathWatchEvent(Path path, WatchEvent event)
+ public Config getConfig()
+ {
+ return config;
+ }
+
+ public PathWatchEvent(Path path, WatchEvent event, Config config)
{
this.path = path;
- this.count = event.count();
if (event.kind() == ENTRY_CREATE)
{
this.type = PathWatchEventType.ADDED;
@@ -601,8 +582,63 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
{
this.type = PathWatchEventType.UNKNOWN;
}
+ this.config = config;
+ checked = TimeUnit.NANOSECONDS.toMillis(System.nanoTime());
+ check();
+ }
+
+ private void check()
+ {
+ if (Files.exists(path))
+ {
+ try
+ {
+ modified = Files.getLastModifiedTime(path).toMillis();
+ length = Files.size(path);
+ }
+ catch(IOException e)
+ {
+ modified = -1;
+ length = -1;
+ }
+ }
+ else
+ {
+ modified = -1;
+ length = -1;
+ }
}
+ public boolean isQuiet(long now, long quietTime)
+ {
+ long lastModified = modified;
+ long lastLength = length;
+
+ check();
+
+ if (lastModified == modified && lastLength == length)
+ return (now-checked)>=quietTime;
+
+ checked = now;
+ return false;
+ }
+
+ public long toQuietCheck(long now, long quietTime)
+ {
+ long check = quietTime - (now-checked);
+ if (check<=0)
+ return quietTime;
+ return check;
+ }
+
+ public void modified()
+ {
+ long now = TimeUnit.NANOSECONDS.toMillis(System.nanoTime());
+ checked = now;
+ check();
+ config.setPauseUntil(now+getUpdateQuietTimeMillis());
+ }
+
/**
* @see java.lang.Object#equals(java.lang.Object)
*/
@@ -650,14 +686,10 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
return type;
}
- public void incrementCount(int num)
- {
- count += num;
- }
-
+ @Deprecated
public int getCount()
{
- return count;
+ return 1;
}
/**
@@ -679,121 +711,10 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
@Override
public String toString()
{
- return String.format("PathWatchEvent[%s|%s]",type,path);
+ return String.format("PathWatchEvent[%8s|%s]",type,path);
}
}
-
-
-
- /**
- * PathPendingEvents
- *
- * For a given path, a list of events that are awaiting the
- * quiet time. The list is in the order that the event were
- * received from the WatchService
- */
- public static class PathPendingEvents
- {
- private Path _path;
- private List _events;
- private long _timestamp;
- private long _lastFileSize = -1;
- public PathPendingEvents (Path path)
- {
- _path = path;
- }
-
- public PathPendingEvents (Path path, PathWatchEvent event)
- {
- this (path);
- addEvent(event);
- }
-
- public void addEvent (PathWatchEvent event)
- {
- long now = System.currentTimeMillis();
- _timestamp = now;
-
- if (_events == null)
- {
- _events = new ArrayList();
- _events.add(event);
- }
- else
- {
- //Check if the same type of event is already present, in which case we
- //can increment its counter. Otherwise, add it
- PathWatchEvent existingType = null;
- for (PathWatchEvent e:_events)
- {
- if (e.getType() == event.getType())
- {
- existingType = e;
- break;
- }
- }
-
- if (existingType == null)
- {
- _events.add(event);
- }
- else
- {
- existingType.incrementCount(event.getCount());
- }
- }
-
- }
-
- public List getEvents()
- {
- return _events;
- }
-
- public long getTimestamp()
- {
- return _timestamp;
- }
-
-
- /**
- * Check to see if the file referenced by this Event is quiet.
- *
- * Will validate the timestamp to see if it is expired, as well as if the file size hasn't changed within the quiet period.
- *
- * Always updates timestamp to 'now' on use of this method.
- *
- * @param now the time now
- *
- * @param expiredDuration
- * the expired duration past the timestamp to be considered expired
- * @param expiredUnit
- * the unit of time for the expired check
- * @return true if expired, false if not
- */
- public boolean isQuiet(long now, long expiredDuration, TimeUnit expiredUnit)
- {
-
- long pastdue = _timestamp + expiredUnit.toMillis(expiredDuration);
- _timestamp = now;
-
- long fileSize = _path.toFile().length(); // File.length() returns 0 for non existant files
- boolean fileSizeChanged = (_lastFileSize != fileSize);
- _lastFileSize = fileSize;
-
- if ((now > pastdue) && (!fileSizeChanged /*|| fileSize == 0*/))
- {
- // Quiet period timestamp has expired, and file size hasn't changed, or the file
- // has been deleted.
- // Consider this a quiet event now.
- return true;
- }
-
- return false;
- }
-
- }
/**
* PathWatchEventType
@@ -806,7 +727,7 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
}
private static final boolean IS_WINDOWS;
-
+
static
{
String os = System.getProperty("os.name");
@@ -821,11 +742,7 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
}
}
- private static final Logger LOG = Log.getLogger(PathWatcher.class);
- /**
- * super noisy debug logging
- */
- private static final Logger NOISY_LOG = Log.getLogger(PathWatcher.class.getName() + ".Noisy");
+ static final Logger LOG = Log.getLogger(PathWatcher.class);
@SuppressWarnings("unchecked")
protected static WatchEvent cast(WatchEvent event)
@@ -834,14 +751,18 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
}
private static final WatchEvent.Kind WATCH_EVENT_KINDS[] = { ENTRY_CREATE, ENTRY_DELETE, ENTRY_MODIFY };
+ private static final WatchEvent.Kind WATCH_DIR_KINDS[] = { ENTRY_CREATE, ENTRY_DELETE };
- private WatchService watchService;
- private WatchEvent.Modifier watchModifiers[];
- private boolean nativeWatchService;
-
- private Map keys = new HashMap<>();
- private List listeners = new CopyOnWriteArrayList<>(); //a listener may modify the listener list directly or by stopping the PathWatcher
- private List configs = new ArrayList<>();
+ private WatchService watchService;
+ private WatchEvent.Modifier watchModifiers[];
+ private boolean nativeWatchService;
+
+ private final List configs = new ArrayList<>();
+ private final Map keys = new HashMap<>();
+ private final List listeners = new CopyOnWriteArrayList<>(); //a listener may modify the listener list directly or by stopping the PathWatcher
+
+ private final Map pending = new LinkedHashMap<>(32,(float)0.75,false);
+ private final List events = new ArrayList<>();
/**
* Update Quiet Time - set to 1000 ms as default (a lower value in Windows is not supported)
@@ -850,8 +771,6 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
private TimeUnit updateQuietTimeUnit = TimeUnit.MILLISECONDS;
private Thread thread;
private boolean _notifyExistingOnStart = true;
- private Map pendingEvents = new LinkedHashMap<>();
-
/**
@@ -860,7 +779,12 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
public PathWatcher()
{
}
-
+
+ public Collection getConfigs()
+ {
+ return configs;
+ }
+
/**
* Request watch on a the given path (either file or dir)
* using all Config defaults. In the case of a dir,
@@ -919,24 +843,6 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
configs.add(config);
}
- /**
- * Register path in the config with the file watch service,
- * walking the tree if it happens to be a directory.
- *
- * @param baseDir the base directory configuration to watch
- * @throws IOException if unable to walk the filesystem tree
- */
- protected void prepareConfig (final Config baseDir) throws IOException
- {
- if (LOG.isDebugEnabled())
- {
- LOG.debug("Watching directory {}",baseDir);
- }
- Files.walkFileTree(baseDir.getPath(), new DepthLimitedFileVisitor(this, baseDir));
- }
-
-
-
/**
* Add a listener for changes the watcher notices.
*
@@ -958,7 +864,7 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
for (Config config : keys.values())
{
- dirs.add(config.dir);
+ dirs.add(config.path);
}
Collections.sort(dirs);
@@ -994,12 +900,14 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
// Register all watched paths, walking dir hierarchies as needed, possibly generating
// fake add events if notifyExistingOnStart is true
for (Config c:configs)
- prepareConfig(c);
+ registerTree(c.getPath(),c,isNotifyExistingOnStart());
// Start Thread for watcher take/pollKeys loop
StringBuilder threadId = new StringBuilder();
- threadId.append("PathWatcher-Thread");
- appendConfigId(threadId);
+ threadId.append("PathWatcher@");
+ threadId.append(Integer.toHexString(hashCode()));
+ if (LOG.isDebugEnabled())
+ LOG.debug("{} -> {}", this, threadId);
thread = new Thread(this,threadId.toString());
thread.setDaemon(true);
@@ -1018,7 +926,8 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
watchService = null;
thread = null;
keys.clear();
- pendingEvents.clear();
+ pending.clear();
+ events.clear();
super.doStop();
}
@@ -1062,9 +971,9 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
Class c = Class.forName("com.sun.nio.file.SensitivityWatchEventModifier");
Field f = c.getField("HIGH");
modifiers = new WatchEvent.Modifier[]
- {
- (WatchEvent.Modifier)f.get(c)
- };
+ {
+ (WatchEvent.Modifier)f.get(c)
+ };
}
}
catch (Throwable t)
@@ -1109,72 +1018,93 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
return TimeUnit.MILLISECONDS.convert(updateQuietTimeDuration,updateQuietTimeUnit);
}
- /**
- * Generate events to the listeners.
- *
- * @param events the events captured
- */
- protected void notifyOnPathWatchEvents (List events)
+ private void registerTree(Path dir, Config config, boolean notify) throws IOException
{
- if (events == null || events.isEmpty())
- return;
-
- for (EventListener listener : listeners)
+ if (LOG.isDebugEnabled())
+ LOG.debug("registerTree {} {} {}", dir, config, notify);
+
+ if (!Files.isDirectory(dir))
+ throw new IllegalArgumentException(dir.toString());
+
+ register(dir,config);
+
+ final MultiException me = new MultiException();
+ Files.list(dir).forEach(p->
{
- if (listener instanceof EventListListener)
- {
- try
- {
- ((EventListListener)listener).onPathWatchEvents(events);
- }
- catch (Throwable t)
- {
- LOG.warn(t);
- }
- }
- else
- {
- Listener l = (Listener)listener;
- for (PathWatchEvent event:events)
- {
- try
- {
- l.onPathWatchEvent(event);
- }
- catch (Throwable t)
- {
- LOG.warn(t);
- }
- }
- }
- }
+ if (LOG.isDebugEnabled())
+ LOG.debug("registerTree? {}",p);
+ try
+ {
+ if (notify && config.test(p))
+ pending.put(p,new PathWatchEvent(p,PathWatchEventType.ADDED,config));
+
+ switch(config.handleDir(p))
+ {
+ case ENTER:
+ registerTree(p,config.asSubConfig(p),notify);
+ break;
+ case WATCH:
+ registerDir(p,config);
+ break;
+ case IGNORE:
+ default:
+ break;
+ }
+ }
+ catch(IOException e)
+ {
+ me.add(e);
+ }
+ });
+
+ try
+ {
+ me.ifExceptionThrow();
+ }
+ catch(IOException e)
+ {
+ throw e;
+ }
+ catch(Throwable th)
+ {
+ throw new IOException(th);
+ }
}
- /**
- * Register a path (directory) with the WatchService.
- *
- * @param dir the directory to register
- * @param root the configuration root
- * @throws IOException if unable to register the path with the watch service.
- */
- protected void register(Path dir, Config root) throws IOException
+ private void registerDir(Path path, Config config) throws IOException
+ {
+ if (LOG.isDebugEnabled())
+ LOG.debug("registerDir {} {}", path, config);
+
+ if (!Files.isDirectory(path))
+ throw new IllegalArgumentException(path.toString());
+
+ register(path,config.asSubConfig(path),WATCH_DIR_KINDS);
+ }
+
+ protected void register(Path path, Config config) throws IOException
+ {
+ if (LOG.isDebugEnabled())
+ LOG.debug("Registering watch on {} {}",path,watchModifiers==null?null:Arrays.asList(watchModifiers));
+
+ register(path,config,WATCH_EVENT_KINDS);
+ }
+
+ private void register(Path path, Config config, WatchEvent.Kind[] kinds) throws IOException
{
-
- LOG.debug("Registering watch on {}",dir);
if(watchModifiers != null)
{
// Java Watcher
- WatchKey key = dir.register(watchService,WATCH_EVENT_KINDS,watchModifiers);
- keys.put(key,root.asSubConfig(dir));
+ WatchKey key = path.register(watchService,kinds,watchModifiers);
+ keys.put(key,config);
} else
{
// Native Watcher
- WatchKey key = dir.register(watchService,WATCH_EVENT_KINDS);
- keys.put(key,root.asSubConfig(dir));
+ WatchKey key = path.register(watchService,kinds);
+ keys.put(key,config);
}
}
-
/**
* Delete a listener
@@ -1207,59 +1137,55 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
@Override
public void run()
{
-
- List notifiableEvents = new ArrayList();
-
// Start the java.nio watching
if (LOG.isDebugEnabled())
{
LOG.debug("Starting java.nio file watching with {}",watchService);
}
- while (watchService != null && thread == Thread.currentThread())
- {
- WatchKey key = null;
+ long wait_time = getUpdateQuietTimeMillis();
+ WatchService watch = watchService;
+
+ while (isRunning() && thread == Thread.currentThread())
+ {
+
+ WatchKey key;
+
try
{
- //If no pending events, wait forever for new events
- if (pendingEvents.isEmpty())
+ // Reset all keys before watching
+ long now = TimeUnit.NANOSECONDS.toMillis(System.nanoTime());
+ for (Map.Entry e : keys.entrySet())
{
- if (NOISY_LOG.isDebugEnabled())
- NOISY_LOG.debug("Waiting for take()");
- key = watchService.take();
- }
- else
- {
- //There are existing events that might be ready to go,
- //only wait as long as the quiet time for any new events
- if (NOISY_LOG.isDebugEnabled())
- NOISY_LOG.debug("Waiting for poll({}, {})",updateQuietTimeDuration,updateQuietTimeUnit);
-
- key = watchService.poll(updateQuietTimeDuration,updateQuietTimeUnit);
-
- //If no new events its safe to process the pendings
- if (key == null)
+ WatchKey k = e.getKey();
+ Config c = e.getValue();
+
+ if (!c.isPaused(now) && !k.reset())
{
- long now = System.currentTimeMillis();
- // no new event encountered.
- for (Path path : new HashSet(pendingEvents.keySet()))
+ keys.remove(k);
+ if (keys.isEmpty())
{
- PathPendingEvents pending = pendingEvents.get(path);
- if (pending.isQuiet(now, updateQuietTimeDuration,updateQuietTimeUnit))
- {
- //No fresh events received during quiet time for this path,
- //so generate the events that were pent up
- for (PathWatchEvent p:pending.getEvents())
- {
- notifiableEvents.add(p);
- }
- // remove from pending list
- pendingEvents.remove(path);
- }
+ return; // all done, no longer monitoring anything
}
}
}
+
+ if (LOG.isDebugEnabled())
+ LOG.debug("Waiting for poll({})", wait_time);
+ key = wait_time<0?watch.take():wait_time>0?watch.poll(wait_time,updateQuietTimeUnit):watch.poll();
+
+ // handle all active keys
+ while (key!=null)
+ {
+ handleKey(key);
+ key = watch.poll();
+ }
+
+ wait_time = processPending();
+
+ notifyEvents();
+
}
catch (ClosedWatchServiceException e)
{
@@ -1276,74 +1202,69 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
{
LOG.ignore(e);
}
- return;
- }
-
- //If there was some new events to process
- if (key != null)
- {
-
- Config config = keys.get(key);
- if (config == null)
- {
- if (LOG.isDebugEnabled())
- {
- LOG.debug("WatchKey not recognized: {}",key);
- }
- continue;
- }
-
- for (WatchEvent event : key.pollEvents())
- {
- @SuppressWarnings("unchecked")
- WatchEvent.Kind kind = (Kind)event.kind();
- WatchEvent ev = cast(event);
- Path name = ev.context();
- Path child = config.dir.resolve(name);
-
- if (kind == ENTRY_CREATE)
- {
- // handle special case for registering new directories
- // recursively
- if (Files.isDirectory(child,LinkOption.NOFOLLOW_LINKS))
- {
- try
- {
- prepareConfig(config.asSubConfig(child));
- }
- catch (IOException e)
- {
- LOG.warn(e);
- }
- }
- else if (config.matches(child))
- {
- addToPendingList(child, new PathWatchEvent(child,ev));
- }
- }
- else if (config.matches(child))
- {
- addToPendingList(child, new PathWatchEvent(child,ev));
- }
- }
- }
-
- //Send any notifications generated this pass
- notifyOnPathWatchEvents(notifiableEvents);
- notifiableEvents.clear();
-
- if (key != null && !key.reset())
- {
- keys.remove(key);
- if (keys.isEmpty())
- {
- return; // all done, no longer monitoring anything
- }
}
}
}
-
+ private void handleKey(WatchKey key)
+ {
+ Config config = keys.get(key);
+ if (config == null)
+ {
+ if (LOG.isDebugEnabled())
+ LOG.debug("WatchKey not recognized: {}",key);
+ return;
+ }
+
+ for (WatchEvent event : key.pollEvents())
+ {
+ WatchEvent ev = cast(event);
+ Path name = ev.context();
+ Path path = config.resolve(name);
+
+ if (LOG.isDebugEnabled())
+ LOG.debug("handleKey? {} {} {}", ev.kind(), config.toShortPath(path), config);
+
+ // Ignore modified events on directories. These are handled as create/delete events of their contents
+ if (ev.kind()==ENTRY_MODIFY && Files.exists(path) && Files.isDirectory(path))
+ continue;
+
+ if (config.test(path))
+ handleWatchEvent(path, new PathWatchEvent(path,ev,config));
+ else if (config.getRecurseDepth()==-1)
+ {
+ // Convert a watched directory into a modify event on its parent
+ Path parent = path.getParent();
+ Config parentConfig = config.getParent();
+ handleWatchEvent(parent, new PathWatchEvent(parent,PathWatchEventType.MODIFIED,parentConfig));
+ continue;
+ }
+
+ if (ev.kind() == ENTRY_CREATE)
+ {
+ try
+ {
+ switch(config.handleDir(path))
+ {
+ case ENTER:
+ registerTree(path,config.asSubConfig(path),true);
+ break;
+ case WATCH:
+ registerDir(path,config);
+ break;
+ case IGNORE:
+ default:
+ break;
+ }
+ }
+ catch(IOException e)
+ {
+ LOG.warn(e);
+ }
+ }
+ }
+ }
+
/**
* Add an event reported by the WatchService to list of pending events
* that will be sent after their quiet time has expired.
@@ -1351,23 +1272,130 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
* @param path the path to add to the pending list
* @param event the pending event
*/
- public void addToPendingList (Path path, PathWatchEvent event)
+ public void handleWatchEvent (Path path, PathWatchEvent event)
{
- PathPendingEvents pending = pendingEvents.get(path);
+ PathWatchEvent existing = pending.get(path);
+
+ if (LOG.isDebugEnabled())
+ LOG.debug("handleWatchEvent {} {} <= {}", path, event, existing);
- //Are there already pending events for this path?
- if (pending == null)
+ switch(event.getType())
{
- //No existing pending events, create pending list
- pendingEvents.put(path,new PathPendingEvents(path, event));
- }
- else
- {
- //There are already some events pending for this path
- pending.addEvent(event);
+ case ADDED:
+ if (existing!=null && existing.getType()==PathWatchEventType.MODIFIED)
+ events.add(new PathWatchEvent(path,PathWatchEventType.DELETED,existing.getConfig()));
+ pending.put(path,event);
+ break;
+
+ case MODIFIED:
+ if (existing==null)
+ pending.put(path,event);
+ else
+ existing.modified();
+ break;
+
+ case DELETED:
+ case UNKNOWN:
+ if (existing!=null)
+ pending.remove(path);
+ events.add(event);
+ break;
+
}
}
-
+
+ private long processPending()
+ {
+ if (LOG.isDebugEnabled())
+ LOG.debug("processPending> {}",pending.values());
+
+ long now = TimeUnit.NANOSECONDS.toMillis(System.nanoTime());
+ long wait = Long.MAX_VALUE;
+
+ // pending map is maintained in LRU order
+ for (PathWatchEvent event : new ArrayList<>(pending.values()))
+ {
+ Path path = event.getPath();
+ // for directories, wait until parent is quiet
+ if (pending.containsKey(path.getParent()))
+ continue;
+
+ // if the path is quiet move to events
+ if (event.isQuiet(now,getUpdateQuietTimeMillis()))
+ {
+ if (LOG.isDebugEnabled())
+ LOG.debug("isQuiet {}",event);
+ pending.remove(path);
+ events.add(event);
+ }
+ else
+ {
+ long ms_to_check = event.toQuietCheck(now,getUpdateQuietTimeMillis());
+ if (LOG.isDebugEnabled())
+ LOG.debug("pending {} {}",event, ms_to_check);
+ if (ms_to_check implements Predicate
{
@Override
@@ -1436,4 +1479,5 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
return false;
}
}
+
}
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/StringUtil.java b/jetty-util/src/main/java/org/eclipse/jetty/util/StringUtil.java
index 6c183a5d36d..43feec4bc9b 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/StringUtil.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/StringUtil.java
@@ -1056,5 +1056,4 @@ public class StringUtil
{
return object==null?null:String.valueOf(object);
}
-
}
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/Locker.java b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/Locker.java
index 87dfc9a910c..ccbbd175876 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/Locker.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/Locker.java
@@ -22,10 +22,10 @@ import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.ReentrantLock;
/**
- * Convenience Lock Wrapper.
+ * Convenience auto closeable {@link java.util.concurrent.locks.ReentrantLock} wrapper.
*
*
- * try(Locker.Lock lock = locker.lock())
+ * try (Locker.Lock lock = locker.lock())
* {
* // something
* }
@@ -33,44 +33,49 @@ import java.util.concurrent.locks.ReentrantLock;
*/
public class Locker
{
- private static final Lock LOCKED = new Lock();
private final ReentrantLock _lock = new ReentrantLock();
- private final Lock _unlock = new UnLock();
-
- public Locker()
- {
- }
+ private final Lock _unlock = new Lock();
+ /**
+ * Acquires the lock.
+ *
+ * @return the lock to unlock
+ */
public Lock lock()
{
- if (_lock.isHeldByCurrentThread())
- throw new IllegalStateException("Locker is not reentrant");
- _lock.lock();
- return _unlock;
- }
-
- public Lock lockIfNotHeld ()
- {
- if (_lock.isHeldByCurrentThread())
- return LOCKED;
_lock.lock();
return _unlock;
}
+ /**
+ * @deprecated use {@link #lock()} instead
+ */
+ @Deprecated
+ public Lock lockIfNotHeld()
+ {
+ return lock();
+ }
+
+ /**
+ * @return whether this lock has been acquired
+ */
public boolean isLocked()
{
return _lock.isLocked();
}
-
- public static class Lock implements AutoCloseable
+
+ /**
+ * @return a {@link Condition} associated with this lock
+ */
+ public Condition newCondition()
{
- @Override
- public void close()
- {
- }
+ return _lock.newCondition();
}
-
- public class UnLock extends Lock
+
+ /**
+ * The unlocker object that unlocks when it is closed.
+ */
+ public class Lock implements AutoCloseable
{
@Override
public void close()
@@ -78,9 +83,9 @@ public class Locker
_lock.unlock();
}
}
-
- public Condition newCondition()
+
+ @Deprecated
+ public class UnLock extends Lock
{
- return _lock.newCondition();
}
}
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ReservedThreadExecutor.java b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ReservedThreadExecutor.java
index 441b9c45f5c..6dd85adcd25 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ReservedThreadExecutor.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ReservedThreadExecutor.java
@@ -22,6 +22,8 @@ import java.util.concurrent.Executor;
import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.locks.Condition;
+import org.eclipse.jetty.util.annotation.ManagedAttribute;
+import org.eclipse.jetty.util.annotation.ManagedObject;
import org.eclipse.jetty.util.component.AbstractLifeCycle;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
@@ -32,17 +34,18 @@ import org.eclipse.jetty.util.log.Logger;
* with a Thread immediately being assigned the Runnable task, or fail if no Thread is
* available. Threads are preallocated up to the capacity from a wrapped {@link Executor}.
*/
+@ManagedObject("A pool for reserved threads")
public class ReservedThreadExecutor extends AbstractLifeCycle implements Executor
{
private static final Logger LOG = Log.getLogger(ReservedThreadExecutor.class);
-
+
private final Executor _executor;
private final Locker _locker = new Locker();
private final ReservedThread[] _queue;
private int _head;
private int _size;
private int _pending;
-
+
public ReservedThreadExecutor(Executor executor)
{
this(executor,1);
@@ -60,15 +63,15 @@ public class ReservedThreadExecutor extends AbstractLifeCycle implements Executo
if (capacity < 0)
{
- if (executor instanceof ThreadPool)
+ int cpus = Runtime.getRuntime().availableProcessors();
+ if (executor instanceof ThreadPool.SizedThreadPool)
{
- int threads = ((ThreadPool)executor).getThreads();
- int cpus = Runtime.getRuntime().availableProcessors();
- capacity = Math.max(1,Math.min(cpus,threads/8));
+ int threads = ((ThreadPool.SizedThreadPool)executor).getMaxThreads();
+ capacity = Math.max(1, Math.min(cpus, threads / 8));
}
else
{
- capacity = Runtime.getRuntime().availableProcessors();
+ capacity = cpus;
}
}
@@ -79,34 +82,31 @@ public class ReservedThreadExecutor extends AbstractLifeCycle implements Executo
{
return _executor;
}
-
+
+ @ManagedAttribute(value = "max number of reserved threads", readonly = true)
public int getCapacity()
{
return _queue.length;
}
-
- public int getPreallocated()
+
+ @ManagedAttribute(value = "available reserved threads", readonly = true)
+ public int getAvailable()
{
try (Locker.Lock lock = _locker.lock())
{
return _size;
}
}
-
- @Override
- public void doStart() throws Exception
+
+ @ManagedAttribute(value = "pending reserved threads", readonly = true)
+ public int getPending()
{
try (Locker.Lock lock = _locker.lock())
{
- _head = _size = _pending = 0;
- while (_pending<_queue.length)
- {
- _executor.execute(new ReservedThread());
- _pending++;
- }
+ return _pending;
}
}
-
+
@Override
public void doStop() throws Exception
{
@@ -121,15 +121,15 @@ public class ReservedThreadExecutor extends AbstractLifeCycle implements Executo
thread._wakeup.signal();
}
}
- }
-
+ }
+
@Override
public void execute(Runnable task) throws RejectedExecutionException
{
if (!tryExecute(task))
throw new RejectedExecutionException();
}
-
+
/**
* @param task The task to run
* @return True iff a reserved thread was available and has been assigned the task to run.
@@ -138,7 +138,7 @@ public class ReservedThreadExecutor extends AbstractLifeCycle implements Executo
{
if (task==null)
return false;
-
+
try (Locker.Lock lock = _locker.lock())
{
if (_size==0)
@@ -150,21 +150,21 @@ public class ReservedThreadExecutor extends AbstractLifeCycle implements Executo
}
return false;
}
-
+
ReservedThread thread = _queue[_head];
_queue[_head] = null;
_head = (_head+1)%_queue.length;
_size--;
-
+
if (_size==0 && _pending<_queue.length)
{
_executor.execute(new ReservedThread());
_pending++;
}
-
+
thread._task = task;
thread._wakeup.signal();
-
+
return true;
}
catch(RejectedExecutionException e)
@@ -174,23 +174,31 @@ public class ReservedThreadExecutor extends AbstractLifeCycle implements Executo
}
}
+ @Override
+ public String toString()
+ {
+ try (Locker.Lock lock = _locker.lock())
+ {
+ return String.format("%s{s=%d,p=%d}",super.toString(),_size,_pending);
+ }
+ }
+
private class ReservedThread implements Runnable
{
private Condition _wakeup = null;
private Runnable _task = null;
-
+
private void reservedWait() throws InterruptedException
{
_wakeup.await();
}
-
+
@Override
public void run()
{
while (true)
{
Runnable task = null;
-
try (Locker.Lock lock = _locker.lock())
{
// if this is our first loop, decrement pending count
@@ -199,20 +207,24 @@ public class ReservedThreadExecutor extends AbstractLifeCycle implements Executo
_pending--;
_wakeup = _locker.newCondition();
}
-
+
// Exit if no longer running or there now too many preallocated threads
if (!isRunning() || _size>=_queue.length)
break;
-
+
// Insert ourselves in the queue
_queue[(_head+_size++)%_queue.length] = this;
- // Wait for a task, ignoring spurious interrupts
- do
+ // Wait for a task, ignoring spurious wakeups
+ while (isRunning() && task==null)
{
try
{
+ if (LOG.isDebugEnabled())
+ LOG.debug("{} waiting", this);
reservedWait();
+ if (LOG.isDebugEnabled())
+ LOG.debug("{} woken up", this);
task = _task;
_task = null;
}
@@ -221,7 +233,6 @@ public class ReservedThreadExecutor extends AbstractLifeCycle implements Executo
LOG.ignore(e);
}
}
- while (isRunning() && task==null);
}
// Run any task
@@ -231,22 +242,12 @@ public class ReservedThreadExecutor extends AbstractLifeCycle implements Executo
{
task.run();
}
- catch (Exception e)
+ catch (Throwable e)
{
LOG.warn(e);
- break;
}
}
}
}
}
-
- @Override
- public String toString()
- {
- try (Locker.Lock lock = _locker.lock())
- {
- return String.format("%s{s=%d,p=%d}",super.toString(),_size,_pending);
- }
- }
}
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/strategy/EatWhatYouKill.java b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/strategy/EatWhatYouKill.java
index 58c38c07bbf..079e9e2684d 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/strategy/EatWhatYouKill.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/strategy/EatWhatYouKill.java
@@ -21,7 +21,11 @@ package org.eclipse.jetty.util.thread.strategy;
import java.io.Closeable;
import java.util.concurrent.Executor;
import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.atomic.LongAdder;
+import org.eclipse.jetty.util.annotation.ManagedAttribute;
+import org.eclipse.jetty.util.annotation.ManagedObject;
+import org.eclipse.jetty.util.annotation.ManagedOperation;
import org.eclipse.jetty.util.component.ContainerLifeCycle;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
@@ -57,6 +61,7 @@ import org.eclipse.jetty.util.thread.ReservedThreadExecutor;
* sub-strategy is called ProduceExecuteConsume (PEC).
*
*/
+@ManagedObject("eat what you kill execution strategy")
public class EatWhatYouKill extends ContainerLifeCycle implements ExecutionStrategy, Runnable
{
private static final Logger LOG = Log.getLogger(EatWhatYouKill.class);
@@ -64,19 +69,22 @@ public class EatWhatYouKill extends ContainerLifeCycle implements ExecutionStrat
private enum State { IDLE, PRODUCING, REPRODUCING }
private final Locker _locker = new Locker();
- private State _state = State.IDLE;
+ private final LongAdder _nonBlocking = new LongAdder();
+ private final LongAdder _blocking = new LongAdder();
+ private final LongAdder _executed = new LongAdder();
private final Producer _producer;
private final Executor _executor;
private final ReservedThreadExecutor _producers;
+ private State _state = State.IDLE;
public EatWhatYouKill(Producer producer, Executor executor)
{
this(producer,executor,new ReservedThreadExecutor(executor,1));
}
- public EatWhatYouKill(Producer producer, Executor executor, int maxProducersPending)
+ public EatWhatYouKill(Producer producer, Executor executor, int maxReserved)
{
- this(producer,executor,new ReservedThreadExecutor(executor,maxProducersPending));
+ this(producer,executor,new ReservedThreadExecutor(executor,maxReserved));
}
public EatWhatYouKill(Producer producer, Executor executor, ReservedThreadExecutor producers)
@@ -184,7 +192,9 @@ public class EatWhatYouKill extends ContainerLifeCycle implements ExecutionStrat
{
// Could another one just have been queued with a produce call?
if (_state==State.REPRODUCING)
+ {
_state = State.PRODUCING;
+ }
else
{
if (LOG.isDebugEnabled())
@@ -194,36 +204,42 @@ public class EatWhatYouKill extends ContainerLifeCycle implements ExecutionStrat
}
}
}
- else if (Invocable.getInvocationType(task)==InvocationType.NON_BLOCKING)
- {
- // PRODUCE CONSUME (EWYK!)
- if (LOG.isDebugEnabled())
- LOG.debug("{} PC t={}",this,task);
- task.run();
- }
else
{
boolean consume;
- try (Lock locked = _locker.lock())
+ if (Invocable.getInvocationType(task) == InvocationType.NON_BLOCKING)
{
- if (_producers.tryExecute(this))
+ // PRODUCE CONSUME (EWYK!)
+ if (LOG.isDebugEnabled())
+ LOG.debug("{} PC t={}", this, task);
+ consume = true;
+ _nonBlocking.increment();
+ }
+ else
+ {
+ try (Lock locked = _locker.lock())
{
- // EXECUTE PRODUCE CONSUME!
- // We have executed a new Producer, so we can EWYK consume
- _state = State.IDLE;
- producing = false;
- consume = true;
- }
- else
- {
- // PRODUCE EXECUTE CONSUME!
- consume = false;
+ if (_producers.tryExecute(this))
+ {
+ // EXECUTE PRODUCE CONSUME!
+ // We have executed a new Producer, so we can EWYK consume
+ _state = State.IDLE;
+ producing = false;
+ consume = true;
+ _blocking.increment();
+ }
+ else
+ {
+ // PRODUCE EXECUTE CONSUME!
+ consume = false;
+ _executed.increment();
+ }
}
+
+ if (LOG.isDebugEnabled())
+ LOG.debug("{} {} t={}", this, consume ? "EPC" : "PEC", task);
}
- if (LOG.isDebugEnabled())
- LOG.debug("{} {} t={}",this,consume?"EPC":"PEC",task);
-
// Consume or execute task
try
{
@@ -232,7 +248,7 @@ public class EatWhatYouKill extends ContainerLifeCycle implements ExecutionStrat
else
_executor.execute(task);
}
- catch(RejectedExecutionException e)
+ catch (RejectedExecutionException e)
{
LOG.warn(e);
if (task instanceof Closeable)
@@ -241,13 +257,13 @@ public class EatWhatYouKill extends ContainerLifeCycle implements ExecutionStrat
{
((Closeable)task).close();
}
- catch(Throwable e2)
+ catch (Throwable e2)
{
LOG.ignore(e2);
}
}
}
- catch(Throwable e)
+ catch (Throwable e)
{
LOG.warn(e);
}
@@ -257,7 +273,26 @@ public class EatWhatYouKill extends ContainerLifeCycle implements ExecutionStrat
return producing;
}
- public Boolean isIdle()
+ @ManagedAttribute(value = "number of non blocking tasks consumed", readonly = true)
+ public long getNonBlockingTasksConsumed()
+ {
+ return _nonBlocking.longValue();
+ }
+
+ @ManagedAttribute(value = "number of blocking tasks consumed", readonly = true)
+ public long getBlockingTasksConsumed()
+ {
+ return _blocking.longValue();
+ }
+
+ @ManagedAttribute(value = "number of blocking tasks executed", readonly = true)
+ public long getBlockingTasksExecuted()
+ {
+ return _executed.longValue();
+ }
+
+ @ManagedAttribute(value = "whether this execution strategy is idle", readonly = true)
+ public boolean isIdle()
{
try (Lock locked = _locker.lock())
{
@@ -265,6 +300,14 @@ public class EatWhatYouKill extends ContainerLifeCycle implements ExecutionStrat
}
}
+ @ManagedOperation(value = "resets the task counts", impact = "ACTION")
+ public void reset()
+ {
+ _nonBlocking.reset();
+ _blocking.reset();
+ _executed.reset();
+ }
+
public String toString()
{
try (Lock locked = _locker.lock())
diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/MultiReleaseJarFileTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/MultiReleaseJarFileTest.java
new file mode 100644
index 00000000000..01031f6296a
--- /dev/null
+++ b/jetty-util/src/test/java/org/eclipse/jetty/util/MultiReleaseJarFileTest.java
@@ -0,0 +1,92 @@
+//
+// ========================================================================
+// Copyright (c) 1995-2017 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;
+
+import java.io.File;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.eclipse.jetty.toolchain.test.AdvancedRunner;
+import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
+import org.hamcrest.Matchers;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+@RunWith(AdvancedRunner.class)
+public class MultiReleaseJarFileTest
+{
+ private File testResources = MavenTestingUtils.getTestResourcesDir().getAbsoluteFile();
+ private File example = new File(testResources,"example.jar");
+
+ @Test
+ public void testExampleJarIsMR() throws Exception
+ {
+ MultiReleaseJarFile jarFile = new MultiReleaseJarFile(example);
+ assertTrue(jarFile.isMultiRelease());
+ }
+
+ @Test
+ public void testBase() throws Exception
+ {
+ MultiReleaseJarFile jarFile = new MultiReleaseJarFile(example,8,false);
+ assertThat(jarFile.getEntry("META-INF/MANIFEST.MF").getVersion(), is(0));
+ assertThat(jarFile.getEntry("org/example/OnlyInBase.class").getVersion(), is(0));
+ assertThat(jarFile.getEntry("org/example/InBoth$InnerBase.class").getVersion(), is(0));
+ assertThat(jarFile.getEntry("org/example/InBoth$InnerBoth.class").getVersion(), is(0));
+ assertThat(jarFile.getEntry("org/example/InBoth.class").getVersion(), is(0));
+
+ assertThat(jarFile.stream().count(), is(5L));
+ }
+
+ @Test
+ public void test9() throws Exception
+ {
+ MultiReleaseJarFile jarFile = new MultiReleaseJarFile(example,9,false);
+ assertThat(jarFile.getEntry("META-INF/MANIFEST.MF").getVersion(), is(0));
+ assertThat(jarFile.getEntry("org/example/OnlyInBase.class").getVersion(), is(0));
+ assertThat(jarFile.getEntry("org/example/InBoth$InnerBoth.class").getVersion(), is(9));
+ assertThat(jarFile.getEntry("org/example/InBoth.class").getVersion(), is(9));
+ assertThat(jarFile.getEntry("org/example/OnlyIn9.class").getVersion(), is(9));
+ assertThat(jarFile.getEntry("org/example/onlyIn9/OnlyIn9.class").getVersion(), is(9));
+ assertThat(jarFile.getEntry("org/example/InBoth$Inner9.class").getVersion(), is(9));
+
+ assertThat(jarFile.stream().count(), is(7L));
+ }
+
+ @Test
+ public void test10() throws Exception
+ {
+ MultiReleaseJarFile jarFile = new MultiReleaseJarFile(example,10,false);
+ assertThat(jarFile.getEntry("META-INF/MANIFEST.MF").getVersion(), is(0));
+ assertThat(jarFile.getEntry("org/example/OnlyInBase.class").getVersion(), is(0));
+ assertThat(jarFile.getEntry("org/example/InBoth.class").getVersion(), is(10));
+ assertThat(jarFile.getEntry("org/example/OnlyIn9.class").getVersion(), is(9));
+ assertThat(jarFile.getEntry("org/example/onlyIn9/OnlyIn9.class").getVersion(), is(9));
+ assertThat(jarFile.getEntry("org/example/In10Only.class").getVersion(), is(10));
+
+ assertThat(jarFile.stream().count(), is(6L));
+ }
+
+
+}
diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/PathWatcherTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/PathWatcherTest.java
index 055192c8ae9..7691941cc05 100644
--- a/jetty-util/src/test/java/org/eclipse/jetty/util/PathWatcherTest.java
+++ b/jetty-util/src/test/java/org/eclipse/jetty/util/PathWatcherTest.java
@@ -18,9 +18,14 @@
package org.eclipse.jetty.util;
-import static org.eclipse.jetty.util.PathWatcher.PathWatchEventType.*;
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
+import static org.eclipse.jetty.util.PathWatcher.PathWatchEventType.ADDED;
+import static org.eclipse.jetty.util.PathWatcher.PathWatchEventType.DELETED;
+import static org.eclipse.jetty.util.PathWatcher.PathWatchEventType.MODIFIED;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.FileOutputStream;
@@ -28,6 +33,9 @@ import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.nio.file.attribute.DosFileAttributes;
+import java.nio.file.attribute.FileTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -36,19 +44,37 @@ import java.util.Map;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import org.eclipse.jetty.toolchain.test.AdvancedRunner;
import org.eclipse.jetty.toolchain.test.OS;
import org.eclipse.jetty.toolchain.test.TestingDir;
import org.eclipse.jetty.util.PathWatcher.PathWatchEvent;
import org.eclipse.jetty.util.PathWatcher.PathWatchEventType;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
-import org.junit.Ignore;
+import org.junit.Assume;
import org.junit.Rule;
import org.junit.Test;
+import org.junit.runner.RunWith;
-@Ignore("Disabled due to behavioral differences in various FileSystems (hard to write a single testcase that works in all scenarios)")
+@RunWith(AdvancedRunner.class)
public class PathWatcherTest
{
+ public static final int QUIET_TIME;
+ public static final int WAIT_TIME;
+ public static final int LONG_TIME;
+
+ static
+ {
+ if (OS.IS_LINUX)
+ QUIET_TIME = 300;
+ else if (OS.IS_OSX)
+ QUIET_TIME = 5000;
+ else
+ QUIET_TIME = 1000;
+ WAIT_TIME = 2 * QUIET_TIME;
+ LONG_TIME = 5 * QUIET_TIME;
+ }
+
public static class PathWatchEventCapture implements PathWatcher.Listener
{
public final static String FINISH_TAG = "#finished#.tag";
@@ -76,27 +102,17 @@ public class PathWatcherTest
events.clear();
}
+ public void reset(int count)
+ {
+ setFinishTrigger(count);
+ events.clear();
+ }
+
@Override
public void onPathWatchEvent(PathWatchEvent event)
{
synchronized (events)
{
- //if triggered by path
- if (triggerPath != null)
- {
-
- if (triggerPath.equals(event.getPath()) && (event.getType() == triggerType))
- {
- LOG.debug("Encountered finish trigger: {} on {}",event.getType(),event.getPath());
- finishedLatch.countDown();
- }
- }
- else if (finishedLatch != null)
- {
- finishedLatch.countDown();
- }
-
-
Path relativePath = this.baseDir.relativize(event.getPath());
String key = relativePath.toString().replace(File.separatorChar,'/');
@@ -109,6 +125,20 @@ public class PathWatcherTest
this.events.put(key,types);
LOG.debug("Captured Event: {} | {}",event.getType(),key);
}
+ //if triggered by path
+ if (triggerPath != null)
+ {
+
+ if (triggerPath.equals(event.getPath()) && (event.getType() == triggerType))
+ {
+ LOG.debug("Encountered finish trigger: {} on {}",event.getType(),event.getPath());
+ finishedLatch.countDown();
+ }
+ }
+ else if (finishedLatch != null)
+ {
+ finishedLatch.countDown();
+ }
}
/**
@@ -122,13 +152,21 @@ public class PathWatcherTest
*/
public void assertEvents(Map expectedEvents)
{
- assertThat("Event match (file|diretory) count",this.events.size(),is(expectedEvents.size()));
-
- for (Map.Entry entry : expectedEvents.entrySet())
+ try
{
- String relativePath = entry.getKey();
- PathWatchEventType[] expectedTypes = entry.getValue();
- assertEvents(relativePath,expectedTypes);
+ assertThat("Event match (file|directory) count", this.events.size(), is(expectedEvents.size()));
+
+ for (Map.Entry entry : expectedEvents.entrySet())
+ {
+ String relativePath = entry.getKey();
+ PathWatchEventType[] expectedTypes = entry.getValue();
+ assertEvents(relativePath, expectedTypes);
+ }
+ }
+ catch(Throwable th)
+ {
+ System.err.println(this.events);
+ throw th;
}
}
@@ -175,7 +213,7 @@ public class PathWatcherTest
latchCount = count;
finishedLatch = new CountDownLatch(latchCount);
}
-
+
/**
* Await the countdown latch on the finish trigger
*
@@ -197,6 +235,12 @@ public class PathWatcherTest
assertThat("Timed Out (" + awaitMillis + "ms) waiting for capture to finish",finishedLatch.await(awaitMillis,TimeUnit.MILLISECONDS),is(true));
LOG.debug("Finished capture");
}
+
+ @Override
+ public String toString()
+ {
+ return events.toString();
+ }
}
private static void updateFile(Path path, String newContents) throws IOException
@@ -228,39 +272,37 @@ public class PathWatcherTest
* @throws InterruptedException
* if sleep between writes was interrupted
*/
- private void updateFileOverTime(Path path, int fileSize, int timeDuration, TimeUnit timeUnit) throws IOException, InterruptedException
+ private void updateFileOverTime(Path path, int timeDuration, TimeUnit timeUnit)
{
- // how long to sleep between writes
- int sleepMs = 100;
-
- // how many millis to spend writing entire file size
- long totalMs = timeUnit.toMillis(timeDuration);
-
- // how many write chunks to write
- int writeCount = (int)((int)totalMs / (int)sleepMs);
-
- // average chunk buffer
- int chunkBufLen = fileSize / writeCount;
- byte chunkBuf[] = new byte[chunkBufLen];
- Arrays.fill(chunkBuf,(byte)'x');
-
- try (FileOutputStream out = new FileOutputStream(path.toFile()))
+ try
{
- int left = fileSize;
+ // how long to sleep between writes
+ int sleepMs = 200;
- while (left > 0)
+ // average chunk buffer
+ int chunkBufLen = 16;
+ byte chunkBuf[] = new byte[chunkBufLen];
+ Arrays.fill(chunkBuf, (byte)'x');
+ long end = System.nanoTime() + timeUnit.toNanos(timeDuration);
+
+ try (FileOutputStream out = new FileOutputStream(path.toFile()))
{
- int len = Math.min(left,chunkBufLen);
- out.write(chunkBuf,0,len);
- left -= chunkBufLen;
- out.flush();
- out.getChannel().force(true);
- // Force file to actually write to disk.
- // Skipping any sort of filesystem caching of the write
- out.getFD().sync();
- TimeUnit.MILLISECONDS.sleep(sleepMs);
+ while(System.nanoTime() expected = new HashMap<>();
- // Create a few directories
- Files.createDirectories(dir.resolve("a/b/c/d"));
+ // Check initial scan events
+ capture.setFinishTrigger(4);
+ pathWatcher.start();
+ expected.put("file0",new PathWatchEventType[] { ADDED });
+ expected.put("subdir0",new PathWatchEventType[] { ADDED });
+ expected.put("subdir0/fileA",new PathWatchEventType[] { ADDED });
+ expected.put("subdir0/subsubdir0",new PathWatchEventType[] { ADDED });
- PathWatcher.Config config = new PathWatcher.Config(dir);
+ capture.finishedLatch.await(LONG_TIME,TimeUnit.MILLISECONDS);
+ capture.assertEvents(expected);
+ Thread.sleep(WAIT_TIME);
+ capture.assertEvents(expected);
- config.setRecurseDepth(2);
- assertThat("Config.recurse[1].shouldRecurse[./a/b/c]",config.shouldRecurseDirectory(dir.resolve("a/b/c")),is(false));
- assertThat("Config.recurse[1].shouldRecurse[./a/b]",config.shouldRecurseDirectory(dir.resolve("a/b")),is(true));
- assertThat("Config.recurse[1].shouldRecurse[./a]",config.shouldRecurseDirectory(dir.resolve("a")),is(true));
- assertThat("Config.recurse[1].shouldRecurse[./]",config.shouldRecurseDirectory(dir),is(true));
- }
-
-
- @Test
- public void testConfig_ShouldRecurse_3() throws IOException
- {
- Path dir = testdir.getEmptyPathDir();
-
- //Create some deep dirs
- Files.createDirectories(dir.resolve("a/b/c/d/e/f/g"));
-
- PathWatcher.Config config = new PathWatcher.Config(dir);
- config.setRecurseDepth(PathWatcher.Config.UNLIMITED_DEPTH);
- assertThat("Config.recurse[1].shouldRecurse[./a/b/c/d/g]",config.shouldRecurseDirectory(dir.resolve("a/b/c/d/g")),is(true));
- assertThat("Config.recurse[1].shouldRecurse[./a/b/c/d/f]",config.shouldRecurseDirectory(dir.resolve("a/b/c/d/f")),is(true));
- assertThat("Config.recurse[1].shouldRecurse[./a/b/c/d/e]",config.shouldRecurseDirectory(dir.resolve("a/b/c/d/e")),is(true));
- assertThat("Config.recurse[1].shouldRecurse[./a/b/c/d]",config.shouldRecurseDirectory(dir.resolve("a/b/c/d")),is(true));
- assertThat("Config.recurse[1].shouldRecurse[./a/b/c]",config.shouldRecurseDirectory(dir.resolve("a/b/c")),is(true));
- assertThat("Config.recurse[1].shouldRecurse[./a/b]",config.shouldRecurseDirectory(dir.resolve("a/b")),is(true));
- assertThat("Config.recurse[1].shouldRecurse[./a]",config.shouldRecurseDirectory(dir.resolve("a")),is(true));
- assertThat("Config.recurse[1].shouldRecurse[./]",config.shouldRecurseDirectory(dir),is(true));
+ // Check adding files
+ capture.reset(3);
+ expected.clear();
+ Files.createFile(dir.resolve("subdir0/subsubdir0/toodeep"));
+ expected.put("subdir0/subsubdir0",new PathWatchEventType[] { MODIFIED });
+ Files.createFile(dir.resolve("file1"));
+ expected.put("file1",new PathWatchEventType[] { ADDED });
+ Files.createFile(dir.resolve("subdir0/fileB"));
+ expected.put("subdir0/fileB",new PathWatchEventType[] { ADDED });
+
+ capture.finishedLatch.await(LONG_TIME,TimeUnit.MILLISECONDS);
+ capture.assertEvents(expected);
+ Thread.sleep(WAIT_TIME);
+ capture.assertEvents(expected);
+
+ // Check slow modification
+ capture.reset(1);
+ expected.clear();
+ long start = System.nanoTime();
+ new Thread(()->{updateFileOverTime(dir.resolve("file1"),2*QUIET_TIME,TimeUnit.MILLISECONDS);}).start();
+ expected.put("file1",new PathWatchEventType[] { MODIFIED });
+ capture.finishedLatch.await(LONG_TIME,TimeUnit.MILLISECONDS);
+ long end = System.nanoTime();
+ capture.assertEvents(expected);
+ assertThat(end-start,greaterThan(TimeUnit.MILLISECONDS.toNanos(2*QUIET_TIME)));
+ Thread.sleep(WAIT_TIME);
+ capture.assertEvents(expected);
+
+ // Check slow add
+ capture.reset(1);
+ expected.clear();
+ start = System.nanoTime();
+ new Thread(()->{updateFileOverTime(dir.resolve("file2"),2*QUIET_TIME,TimeUnit.MILLISECONDS);}).start();
+ expected.put("file2",new PathWatchEventType[] { ADDED });
+ capture.finishedLatch.await(LONG_TIME,TimeUnit.MILLISECONDS);
+ end = System.nanoTime();
+ capture.assertEvents(expected);
+ assertThat(end-start,greaterThan(TimeUnit.MILLISECONDS.toNanos(2*QUIET_TIME)));
+ Thread.sleep(WAIT_TIME);
+ capture.assertEvents(expected);
+
+ // Check move directory
+ if (OS.IS_LINUX)
+ {
+ capture.reset(5);
+ expected.clear();
+ Files.move(dir.resolve("subdir0"), dir.resolve("subdir1"), StandardCopyOption.ATOMIC_MOVE);
+ expected.put("subdir0", new PathWatchEventType[]{DELETED});
+ // TODO expected.put("subdir0/fileA",new PathWatchEventType[] { DELETED });
+ // TODO expected.put("subdir0/subsubdir0",new PathWatchEventType[] { DELETED });
+ expected.put("subdir1", new PathWatchEventType[]{ADDED});
+ expected.put("subdir1/fileA", new PathWatchEventType[]{ADDED});
+ expected.put("subdir1/fileB", new PathWatchEventType[]{ADDED});
+ expected.put("subdir1/subsubdir0", new PathWatchEventType[]{ADDED});
+
+ capture.finishedLatch.await(LONG_TIME, TimeUnit.MILLISECONDS);
+ capture.assertEvents(expected);
+ Thread.sleep(WAIT_TIME);
+ capture.assertEvents(expected);
+ }
+
+ // Check delete file
+ capture.reset(2);
+ expected.clear();
+ Files.delete(dir.resolve("file1"));
+ expected.put("file1",new PathWatchEventType[] { DELETED });
+ Files.delete(dir.resolve("file2"));
+ expected.put("file2",new PathWatchEventType[] { DELETED });
+
+ capture.finishedLatch.await(LONG_TIME,TimeUnit.MILLISECONDS);
+ capture.assertEvents(expected);
+ Thread.sleep(WAIT_TIME);
+ capture.assertEvents(expected);
+
+ }
+ finally
+ {
+ pathWatcher.stop();
+ }
}
@Test
@@ -371,7 +456,7 @@ public class PathWatcherTest
PathWatcher pathWatcher = new PathWatcher();
pathWatcher.setNotifyExistingOnStart(true);
- pathWatcher.setUpdateQuietTime(500,TimeUnit.MILLISECONDS);
+ pathWatcher.setUpdateQuietTime(QUIET_TIME,TimeUnit.MILLISECONDS);
// Add listener
PathWatchEventCapture capture = new PathWatchEventCapture(dir);
@@ -440,13 +525,17 @@ public class PathWatcherTest
// Files we don't care about
Files.createFile(dir.resolve("foo.war.backup"));
- Files.createFile(dir.resolve(".hidden.war"));
+
+ String hidden_war = OS.IS_WINDOWS ? "hidden.war" : ".hidden.war";
+ Files.createFile(dir.resolve(hidden_war));
+ if (OS.IS_WINDOWS)
+ Files.setAttribute(dir.resolve(hidden_war),"dos:hidden",Boolean.TRUE);
Files.createDirectories(dir.resolve(".wat/WEB-INF"));
Files.createFile(dir.resolve(".wat/huh.war"));
Files.createFile(dir.resolve(".wat/WEB-INF/web.xml"));
PathWatcher pathWatcher = new PathWatcher();
- pathWatcher.setUpdateQuietTime(300,TimeUnit.MILLISECONDS);
+ pathWatcher.setUpdateQuietTime(QUIET_TIME,TimeUnit.MILLISECONDS);
// Add listener
PathWatchEventCapture capture = new PathWatchEventCapture(dir);
@@ -462,17 +551,19 @@ public class PathWatcherTest
try
{
+ capture.setFinishTrigger(2);
pathWatcher.start();
// Let quiet time do its thing
- awaitQuietTime(pathWatcher);
+ capture.finishedLatch.await(LONG_TIME,TimeUnit.MILLISECONDS);
Map expected = new HashMap<>();
-
expected.put("bar/WEB-INF/web.xml",new PathWatchEventType[] { ADDED });
expected.put("foo.war",new PathWatchEventType[] { ADDED });
capture.assertEvents(expected);
+ TimeUnit.MILLISECONDS.sleep(WAIT_TIME);
+ capture.assertEvents(expected);
}
finally
{
@@ -498,11 +589,10 @@ public class PathWatcherTest
PathWatcher pathWatcher = new PathWatcher();
- pathWatcher.setUpdateQuietTime(300,TimeUnit.MILLISECONDS);
+ pathWatcher.setUpdateQuietTime(QUIET_TIME,TimeUnit.MILLISECONDS);
// Add listener
PathWatchEventCapture capture = new PathWatchEventCapture(dir);
- capture.setFinishTrigger(3);
pathWatcher.addListener(capture);
// Add test dir configuration
@@ -514,10 +604,9 @@ public class PathWatcherTest
try
{
+ capture.setFinishTrigger(3);
pathWatcher.start();
-
- // Let quiet time do its thing
- awaitQuietTime(pathWatcher);
+ assertTrue(capture.finishedLatch.await(LONG_TIME,TimeUnit.MILLISECONDS));
Map expected = new HashMap<>();
@@ -525,6 +614,8 @@ public class PathWatcherTest
expected.put("b/b.txt",new PathWatchEventType[] { ADDED });
expected.put("c/d/d.txt",new PathWatchEventType[] { ADDED });
capture.assertEvents(expected);
+ TimeUnit.MILLISECONDS.sleep(WAIT_TIME);
+ capture.assertEvents(expected);
}
finally
{
@@ -543,16 +634,15 @@ public class PathWatcherTest
Files.createFile(dir.resolve("bar/WEB-INF/web.xml"));
PathWatcher pathWatcher = new PathWatcher();
- pathWatcher.setUpdateQuietTime(300,TimeUnit.MILLISECONDS);
+ pathWatcher.setUpdateQuietTime(QUIET_TIME,TimeUnit.MILLISECONDS);
// Add listener
PathWatchEventCapture capture = new PathWatchEventCapture(dir);
- capture.setFinishTrigger(5);
pathWatcher.addListener(capture);
// Add test dir configuration
PathWatcher.Config baseDirConfig = new PathWatcher.Config(dir);
- baseDirConfig.setRecurseDepth(2);
+ baseDirConfig.setRecurseDepth(100);
baseDirConfig.addExcludeHidden();
baseDirConfig.addIncludeGlobRelative("*.war");
baseDirConfig.addIncludeGlobRelative("*/WEB-INF/web.xml");
@@ -560,11 +650,13 @@ public class PathWatcherTest
try
{
+ capture.setFinishTrigger(2);
pathWatcher.start();
- // Pretend that startup occurred
- awaitQuietTime(pathWatcher);
+ assertTrue(capture.finishedLatch.await(LONG_TIME,TimeUnit.MILLISECONDS));
+ capture.setFinishTrigger(3);
+
// Update web.xml
Path webFile = dir.resolve("bar/WEB-INF/web.xml");
//capture.setFinishTrigger(webFile,MODIFIED);
@@ -577,7 +669,7 @@ public class PathWatcherTest
Files.createFile(dir.resolve("bar.war"));
// Let capture complete
- capture.awaitFinish(pathWatcher);
+ assertTrue(capture.finishedLatch.await(LONG_TIME,TimeUnit.MILLISECONDS));
Map expected = new HashMap<>();
@@ -586,6 +678,8 @@ public class PathWatcherTest
expected.put("bar.war",new PathWatchEventType[] { ADDED });
capture.assertEvents(expected);
+ TimeUnit.MILLISECONDS.sleep(WAIT_TIME);
+ capture.assertEvents(expected);
}
finally
{
@@ -604,7 +698,7 @@ public class PathWatcherTest
Files.createFile(dir.resolve("bar/WEB-INF/web.xml"));
PathWatcher pathWatcher = new PathWatcher();
- pathWatcher.setUpdateQuietTime(300,TimeUnit.MILLISECONDS);
+ pathWatcher.setUpdateQuietTime(QUIET_TIME,TimeUnit.MILLISECONDS);
// Add listener
PathWatchEventCapture capture = new PathWatchEventCapture(dir);
@@ -620,26 +714,36 @@ public class PathWatcherTest
try
{
+ capture.setFinishTrigger(2);
pathWatcher.start();
// Pretend that startup occurred
- awaitQuietTime(pathWatcher);
+ assertTrue(capture.finishedLatch.await(LONG_TIME,TimeUnit.MILLISECONDS));
// New war added
+ capture.setFinishTrigger(1);
Path warFile = dir.resolve("hello.war");
- capture.setFinishTrigger(warFile,MODIFIED);
- updateFile(warFile,"Hello Update");
+ updateFile(warFile,"Create Hello");
+ Thread.sleep(QUIET_TIME/2);
+ updateFile(warFile,"Hello 1");
+ Thread.sleep(QUIET_TIME/2);
+ updateFile(warFile,"Hello two");
+ Thread.sleep(QUIET_TIME/2);
+ updateFile(warFile,"Hello three");
// Let capture finish
- capture.awaitFinish(pathWatcher);
+ assertTrue(capture.finishedLatch.await(LONG_TIME,TimeUnit.MILLISECONDS));
Map expected = new HashMap<>();
expected.put("bar/WEB-INF/web.xml",new PathWatchEventType[] { ADDED });
expected.put("foo.war",new PathWatchEventType[] { ADDED });
- expected.put("hello.war",new PathWatchEventType[] { ADDED, MODIFIED });
+ expected.put("hello.war",new PathWatchEventType[] { ADDED });
capture.assertEvents(expected);
+ TimeUnit.MILLISECONDS.sleep(WAIT_TIME);
+ Assume.assumeFalse(OS.IS_OSX); // TODO fix this
+ capture.assertEvents(expected);
}
finally
{
@@ -647,8 +751,195 @@ public class PathWatcherTest
}
}
+ @Test
+ public void testDeployFiles_NewDir() throws Exception
+ {
+ Path dir = testdir.getEmptyPathDir();
+
+ // Files we are interested in
+ Files.createFile(dir.resolve("foo.war"));
+
+ PathWatcher pathWatcher = new PathWatcher();
+ pathWatcher.setUpdateQuietTime(QUIET_TIME,TimeUnit.MILLISECONDS);
+
+ // Add listener
+ PathWatchEventCapture capture = new PathWatchEventCapture(dir);
+ pathWatcher.addListener(capture);
+
+ // Add test dir configuration
+ PathWatcher.Config baseDirConfig = new PathWatcher.Config(dir);
+ baseDirConfig.setRecurseDepth(2);
+ baseDirConfig.addExcludeHidden();
+ baseDirConfig.addIncludeGlobRelative("*.war");
+ baseDirConfig.addIncludeGlobRelative("*/WEB-INF/web.xml");
+ pathWatcher.watch(baseDirConfig);
+
+ try
+ {
+ capture.setFinishTrigger(1);
+ pathWatcher.start();
+
+ // Pretend that startup occurred
+ assertTrue(capture.finishedLatch.await(LONG_TIME,TimeUnit.MILLISECONDS));
+
+ // New war added
+ capture.setFinishTrigger(1);
+
+ Files.createDirectories(dir.resolve("bar/WEB-INF"));
+ Thread.sleep(QUIET_TIME/2);
+ Files.createFile(dir.resolve("bar/WEB-INF/web.xml"));
+ Thread.sleep(QUIET_TIME/2);
+ updateFile(dir.resolve("bar/WEB-INF/web.xml"),"Update");
+ Thread.sleep(QUIET_TIME/2);
+ updateFile(dir.resolve("bar/WEB-INF/web.xml"),"Update web.xml");
+
+ // Let capture finish
+ assertTrue(capture.finishedLatch.await(LONG_TIME,TimeUnit.MILLISECONDS));
+
+ Map expected = new HashMap<>();
+
+ expected.put("bar/WEB-INF/web.xml",new PathWatchEventType[] { ADDED });
+ expected.put("foo.war",new PathWatchEventType[] { ADDED });
+
+ capture.assertEvents(expected);
+ TimeUnit.MILLISECONDS.sleep(WAIT_TIME);
+ capture.assertEvents(expected);
+ }
+ finally
+ {
+ pathWatcher.stop();
+ }
+ }
+
+
+ @Test
+ public void testDeployFilesBeyondDepthLimit() throws Exception
+ {
+ Path dir = testdir.getEmptyPathDir();
+
+ // Files we are interested in
+ Files.createDirectories(dir.resolve("foo/WEB-INF/lib"));
+ Files.createDirectories(dir.resolve("bar/WEB-INF/lib"));
+
+ PathWatcher pathWatcher = new PathWatcher();
+ pathWatcher.setUpdateQuietTime(QUIET_TIME,TimeUnit.MILLISECONDS);
+
+ // Add listener
+ PathWatchEventCapture capture = new PathWatchEventCapture(dir);
+ pathWatcher.addListener(capture);
+
+ // Add test dir configuration
+ PathWatcher.Config baseDirConfig = new PathWatcher.Config(dir);
+ baseDirConfig.setRecurseDepth(0);
+ pathWatcher.watch(baseDirConfig);
+
+ try
+ {
+ capture.setFinishTrigger(2);
+ pathWatcher.start();
+
+ // Pretend that startup occurred
+ assertTrue(capture.finishedLatch.await(LONG_TIME,TimeUnit.MILLISECONDS));
+
+ Map expected = new HashMap<>();
+ expected.put("foo",new PathWatchEventType[] { ADDED });
+ expected.put("bar",new PathWatchEventType[] { ADDED });
+
+ capture.assertEvents(expected);
+
+ capture.reset(1);
+ expected.clear();
+ expected.put("bar",new PathWatchEventType[] { MODIFIED });
+ Files.createFile(dir.resolve("bar/index.html"));
+ assertTrue(capture.finishedLatch.await(LONG_TIME,TimeUnit.MILLISECONDS));
+
+ capture.assertEvents(expected);
+ TimeUnit.MILLISECONDS.sleep(WAIT_TIME);
+ capture.assertEvents(expected);
+
+ capture.reset(1);
+ expected.clear();
+ expected.put("bob",new PathWatchEventType[] { ADDED });
+ Files.createFile(dir.resolve("bar/WEB-INF/lib/ignored"));
+ PathWatcher.LOG.debug("create bob");
+ Files.createDirectories(dir.resolve("bob/WEB-INF/lib"));
+ Thread.sleep(QUIET_TIME/2);
+ PathWatcher.LOG.debug("create bob/index.html");
+ Files.createFile(dir.resolve("bob/index.html"));
+ Thread.sleep(QUIET_TIME/2);
+ PathWatcher.LOG.debug("update bob/index.html");
+ updateFile(dir.resolve("bob/index.html"),"Update");
+ Thread.sleep(QUIET_TIME/2);
+ PathWatcher.LOG.debug("update bob/index.html");
+ updateFile(dir.resolve("bob/index.html"),"Update index.html");
+
+ assertTrue(capture.finishedLatch.await(LONG_TIME,TimeUnit.MILLISECONDS));
+ capture.assertEvents(expected);
+ TimeUnit.MILLISECONDS.sleep(WAIT_TIME);
+ capture.assertEvents(expected);
+
+ }
+ finally
+ {
+ pathWatcher.stop();
+ }
+ }
+
+
+ @Test
+ public void testWatchFile() throws Exception
+ {
+ Path dir = testdir.getEmptyPathDir();
+
+ // Files we are interested in
+ Files.createDirectories(dir.resolve("bar/WEB-INF"));
+ Files.createFile(dir.resolve("bar/WEB-INF/web.xml"));
+
+ PathWatcher pathWatcher = new PathWatcher();
+ pathWatcher.setUpdateQuietTime(QUIET_TIME,TimeUnit.MILLISECONDS);
+
+ // Add listener
+ PathWatchEventCapture capture = new PathWatchEventCapture(dir);
+ pathWatcher.addListener(capture);
+
+ // Add test configuration
+ pathWatcher.watch(dir.resolve("bar/WEB-INF/web.xml"));
+ pathWatcher.setNotifyExistingOnStart(false);
+
+ try
+ {
+ pathWatcher.start();
+ Thread.sleep(WAIT_TIME);
+ assertThat(capture.events.size(),is(0));
+
+ Files.createFile(dir.resolve("bar/index.htnl"));
+ Files.createFile(dir.resolve("bar/WEB-INF/other.xml"));
+ Files.createDirectories(dir.resolve("bar/WEB-INF/lib"));
+
+ Thread.sleep(WAIT_TIME);
+ assertThat(capture.events.size(),is(0));
+
+ capture.setFinishTrigger(1);
+ updateFile(dir.resolve("bar/WEB-INF/web.xml"),"Update web.xml");
+ assertTrue(capture.finishedLatch.await(LONG_TIME,TimeUnit.MILLISECONDS));
+
+ Map expected = new HashMap<>();
+
+ expected.put("bar/WEB-INF/web.xml",new PathWatchEventType[] { MODIFIED });
+
+ capture.assertEvents(expected);
+ TimeUnit.MILLISECONDS.sleep(WAIT_TIME);
+ capture.assertEvents(expected);
+ }
+ finally
+ {
+ pathWatcher.stop();
+ }
+ }
+
+
/**
- * Pretend to add a new war file that is large, and being copied into place
+ * Pretend to modify a new war file that is large, and being copied into place
* using some sort of technique that is slow enough that it takes a while for
* the entire war file to exist in place.
*
@@ -658,17 +949,18 @@ public class PathWatcherTest
* on test failure
*/
@Test
- public void testDeployFiles_NewWar_LargeSlowCopy() throws Exception
+ public void testDeployFiles_ModifyWar_LargeSlowCopy() throws Exception
{
Path dir = testdir.getEmptyPathDir();
// Files we are interested in
Files.createFile(dir.resolve("foo.war"));
+ Files.createFile(dir.resolve("hello.war"));
Files.createDirectories(dir.resolve("bar/WEB-INF"));
Files.createFile(dir.resolve("bar/WEB-INF/web.xml"));
PathWatcher pathWatcher = new PathWatcher();
- pathWatcher.setUpdateQuietTime(500,TimeUnit.MILLISECONDS);
+ pathWatcher.setUpdateQuietTime(QUIET_TIME,TimeUnit.MILLISECONDS);
// Add listener
PathWatchEventCapture capture = new PathWatchEventCapture(dir);
@@ -684,26 +976,35 @@ public class PathWatcherTest
try
{
+ capture.setFinishTrigger(3);
pathWatcher.start();
// Pretend that startup occurred
- awaitQuietTime(pathWatcher);
+ assertTrue(capture.finishedLatch.await(LONG_TIME,TimeUnit.MILLISECONDS));
+
// New war added (slowly)
+ capture.setFinishTrigger(1);
Path warFile = dir.resolve("hello.war");
- capture.setFinishTrigger(warFile,MODIFIED);
- updateFileOverTime(warFile,50 * MB,3,TimeUnit.SECONDS);
-
- // Let capture finish
- capture.awaitFinish(pathWatcher);
+ long start = System.nanoTime();
+ new Thread(()->
+ {
+ updateFileOverTime(warFile,2*QUIET_TIME,TimeUnit.MILLISECONDS);
+ }).start();
+
+ assertTrue(capture.finishedLatch.await(4*QUIET_TIME,TimeUnit.MILLISECONDS));
+ long end = System.nanoTime();
+ assertThat(end-start,greaterThan(TimeUnit.MILLISECONDS.toNanos(2*QUIET_TIME)));
+
Map expected = new HashMap<>();
-
expected.put("bar/WEB-INF/web.xml",new PathWatchEventType[] { ADDED });
expected.put("foo.war",new PathWatchEventType[] { ADDED });
expected.put("hello.war",new PathWatchEventType[] { ADDED, MODIFIED });
capture.assertEvents(expected);
+ TimeUnit.MILLISECONDS.sleep(WAIT_TIME);
+ capture.assertEvents(expected);
}
finally
{
diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/ssl/SslContextFactoryTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/ssl/SslContextFactoryTest.java
index 599f46a62c8..e81bdae9a35 100644
--- a/jetty-util/src/test/java/org/eclipse/jetty/util/ssl/SslContextFactoryTest.java
+++ b/jetty-util/src/test/java/org/eclipse/jetty/util/ssl/SslContextFactoryTest.java
@@ -32,13 +32,11 @@ import java.security.KeyStore;
import javax.net.ssl.SSLEngine;
-import org.eclipse.jetty.toolchain.test.JDK;
import org.eclipse.jetty.util.component.AbstractLifeCycle;
import org.eclipse.jetty.util.log.StacklessLogging;
import org.eclipse.jetty.util.resource.Resource;
import org.hamcrest.Matchers;
import org.junit.Assert;
-import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
@@ -225,8 +223,7 @@ public class SslContextFactoryTest
public void testSetIncludeCipherSuitesRegex() throws Exception
{
cf.setIncludeCipherSuites(".*ECDHE.*",".*WIBBLE.*");
- Assume.assumeFalse(JDK.IS_8);
-
+
cf.start();
SSLEngine sslEngine = cf.newSSLEngine();
String[] enabledCipherSuites = sslEngine.getEnabledCipherSuites();
diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/thread/ReservedThreadExecutorTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/thread/ReservedThreadExecutorTest.java
index f6209683a59..3a3f73325dd 100644
--- a/jetty-util/src/test/java/org/eclipse/jetty/util/thread/ReservedThreadExecutorTest.java
+++ b/jetty-util/src/test/java/org/eclipse/jetty/util/thread/ReservedThreadExecutorTest.java
@@ -25,6 +25,7 @@ import java.util.concurrent.Executor;
import java.util.concurrent.TimeUnit;
import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -33,163 +34,138 @@ import static org.junit.Assert.assertThat;
public class ReservedThreadExecutorTest
{
- final static int SIZE = 2;
- TestExecutor _executor;
- ReservedThreadExecutor _pae;
-
+ private static final int SIZE = 2;
+ private static final Runnable NOOP = () -> {};
+
+ private TestExecutor _executor;
+ private ReservedThreadExecutor _reservedExecutor;
+
@Before
public void before() throws Exception
{
_executor = new TestExecutor();
- _pae = new ReservedThreadExecutor(_executor,SIZE);
- _pae.start();
+ _reservedExecutor = new ReservedThreadExecutor(_executor, SIZE);
+ _reservedExecutor.start();
}
-
-
+
@After
public void after() throws Exception
{
- _pae.stop();
+ _reservedExecutor.stop();
}
@Test
public void testStarted() throws Exception
{
- assertThat(_executor._queue.size(),is(SIZE));
- while(!_executor._queue.isEmpty())
- _executor.execute();
-
- assertThat(_pae.getCapacity(),is(SIZE));
-
- long started = System.nanoTime();
- while (_pae.getPreallocated()10)
- break;
- Thread.sleep(100);
- }
- assertThat(_pae.getPreallocated(),is(SIZE));
+ // Reserved threads are lazily started.
+ assertThat(_executor._queue.size(), is(0));
}
@Test
public void testPending() throws Exception
{
- assertThat(_executor._queue.size(),is(SIZE));
- assertThat(_pae.tryExecute(new NOOP()),is(false));
- assertThat(_executor._queue.size(),is(SIZE));
-
- _executor.execute();
- assertThat(_executor._queue.size(),is(SIZE-1));
- while (!_executor._queue.isEmpty())
+ assertThat(_executor._queue.size(), is(0));
+
+ for (int i = 0; i < SIZE; i++)
+ _reservedExecutor.tryExecute(NOOP);
+ assertThat(_executor._queue.size(), is(SIZE));
+
+ for (int i = 0; i < SIZE; i++)
_executor.execute();
+ assertThat(_executor._queue.size(), is(0));
- long started = System.nanoTime();
- while (_pae.getPreallocated()10)
- break;
- Thread.sleep(100);
- }
- assertThat(_executor._queue.size(),is(0));
- assertThat(_pae.getPreallocated(),is(SIZE));
-
- for (int i=SIZE;i-->0;)
- assertThat(_pae.tryExecute(new Task()),is(true));
- assertThat(_executor._queue.size(),is(1));
- assertThat(_pae.getPreallocated(),is(0));
+ waitForAllAvailable();
- for (int i=SIZE;i-->0;)
- assertThat(_pae.tryExecute(new NOOP()),is(false));
- assertThat(_executor._queue.size(),is(SIZE));
- assertThat(_pae.getPreallocated(),is(0));
-
- assertThat(_pae.tryExecute(new NOOP()),is(false));
- assertThat(_executor._queue.size(),is(SIZE));
- assertThat(_pae.getPreallocated(),is(0));
+ for (int i = 0; i < SIZE; i++)
+ assertThat(_reservedExecutor.tryExecute(new Task()), is(true));
+ assertThat(_executor._queue.size(), is(1));
+ assertThat(_reservedExecutor.getAvailable(), is(0));
+
+ for (int i = 0; i < SIZE; i++)
+ assertThat(_reservedExecutor.tryExecute(NOOP), is(false));
+ assertThat(_executor._queue.size(), is(SIZE));
+ assertThat(_reservedExecutor.getAvailable(), is(0));
}
@Test
public void testExecuted() throws Exception
{
- while(!_executor._queue.isEmpty())
+ assertThat(_executor._queue.size(), is(0));
+
+ for (int i = 0; i < SIZE; i++)
+ _reservedExecutor.tryExecute(NOOP);
+ assertThat(_executor._queue.size(), is(SIZE));
+
+ for (int i = 0; i < SIZE; i++)
_executor.execute();
- long started = System.nanoTime();
- while (_pae.getPreallocated()10)
- break;
- Thread.sleep(100);
- }
- assertThat(_pae.getPreallocated(),is(SIZE));
-
- Task[] task = new Task[SIZE];
- for (int i=SIZE;i-->0;)
- {
- task[i] = new Task();
- assertThat(_pae.tryExecute(task[i]),is(true));
+ tasks[i] = new Task();
+ assertThat(_reservedExecutor.tryExecute(tasks[i]), is(true));
}
- for (int i=SIZE;i-->0;)
- {
- task[i]._ran.await(10,TimeUnit.SECONDS);
- }
+ for (int i = 0; i < SIZE; i++)
+ tasks[i]._ran.await(10, TimeUnit.SECONDS);
+
+ assertThat(_executor._queue.size(), is(1));
- assertThat(_executor._queue.size(),is(1));
Task extra = new Task();
- assertThat(_pae.tryExecute(extra),is(false));
- assertThat(_executor._queue.size(),is(2));
- Thread.sleep(100);
- assertThat(extra._ran.getCount(),is(1L));
+ assertThat(_reservedExecutor.tryExecute(extra), is(false));
+ assertThat(_executor._queue.size(), is(2));
- for (int i=SIZE;i-->0;)
- {
- task[i]._complete.countDown();
- }
-
- started = System.nanoTime();
- while (_pae.getPreallocated()10)
- break;
- Thread.sleep(100);
- }
- assertThat(_pae.getPreallocated(),is(SIZE));
-
-
+ Thread.sleep(500);
+ assertThat(extra._ran.getCount(), is(1L));
+
+ for (int i = 0; i < SIZE; i++)
+ tasks[i]._complete.countDown();
+
+ waitForAllAvailable();
}
-
-
+
+ protected void waitForAllAvailable() throws InterruptedException
+ {
+ long started = System.nanoTime();
+ while (_reservedExecutor.getAvailable() < SIZE)
+ {
+ long elapsed = System.nanoTime() - started;
+ if (elapsed > TimeUnit.SECONDS.toNanos(10))
+ Assert.fail();
+ Thread.sleep(10);
+ }
+ assertThat(_reservedExecutor.getAvailable(), is(SIZE));
+ }
+
private static class TestExecutor implements Executor
{
- Deque _queue = new ArrayDeque<>();
+ private final Deque _queue = new ArrayDeque<>();
@Override
public void execute(Runnable task)
{
_queue.addLast(task);
}
-
+
public void execute()
{
Runnable task = _queue.pollFirst();
- if (task!=null)
+ if (task != null)
new Thread(task).start();
}
}
-
- private static class NOOP implements Runnable
- {
- @Override
- public void run() {}
- }
-
+
private static class Task implements Runnable
{
private CountDownLatch _ran = new CountDownLatch(1);
private CountDownLatch _complete = new CountDownLatch(1);
+
@Override
- public void run()
- {
+ public void run()
+ {
_ran.countDown();
try
{
diff --git a/jetty-util/src/test/resources/example.jar b/jetty-util/src/test/resources/example.jar
new file mode 100644
index 00000000000..171a823145c
Binary files /dev/null and b/jetty-util/src/test/resources/example.jar differ
diff --git a/jetty-util/src/test/resources/jetty-logging.properties b/jetty-util/src/test/resources/jetty-logging.properties
index 3a0ce97e2e0..adc470de2b3 100644
--- a/jetty-util/src/test/resources/jetty-logging.properties
+++ b/jetty-util/src/test/resources/jetty-logging.properties
@@ -1,3 +1,4 @@
# Setup default logging implementation for during testing
org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
#org.eclipse.jetty.util.LEVEL=DEBUG
+#org.eclipse.jetty.util.PathWatcher.LEVEL=DEBUG
\ No newline at end of file
diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JarScanner.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JarScanner.java
index 7dfa1603661..aa6b97b8936 100644
--- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JarScanner.java
+++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JarScanner.java
@@ -43,7 +43,9 @@ import org.eclipse.jetty.util.resource.Resource;
* Subclasses should implement the processEntry(URL jarUrl, JarEntry entry)
* method to handle entries in jar files whose names match the supplied
* pattern.
+ * @deprecated Does not handle MR Jars
*/
+@Deprecated()
public abstract class JarScanner extends org.eclipse.jetty.util.PatternMatcher
{
private static final Logger LOG = Log.getLogger(JarScanner.class);
diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
index 1ec031603f5..54a8fb68623 100644
--- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
+++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
@@ -1431,6 +1431,12 @@ public class StandardDescriptorProcessor extends IterativeDescriptorProcessor
public void visitSecurityConstraint(WebAppContext context, Descriptor descriptor, XmlParser.Node node)
{
+ if (context.getSecurityHandler() == null)
+ {
+ LOG.warn("security-constraint declared but SecurityHandler==null");
+ return;
+ }
+
Constraint scBase = new Constraint();
//ServletSpec 3.0, p74 security-constraints, as minOccurs > 1, are additive
@@ -1704,6 +1710,11 @@ public class StandardDescriptorProcessor extends IterativeDescriptorProcessor
public void visitSecurityRole(WebAppContext context, Descriptor descriptor, XmlParser.Node node)
{
+ if (context.getSecurityHandler() == null)
+ {
+ LOG.warn("security-role declared but SecurityHandler==null");
+ return;
+ }
//ServletSpec 3.0, p74 elements with multiplicity >1 are additive when merged
XmlParser.Node roleNode = node.get("role-name");
String role = roleNode.toString(false, true);
@@ -1941,6 +1952,12 @@ public class StandardDescriptorProcessor extends IterativeDescriptorProcessor
*/
public void visitDenyUncoveredHttpMethods(WebAppContext context, Descriptor descriptor, XmlParser.Node node)
{
+ if (context.getSecurityHandler() == null)
+ {
+ LOG.warn("deny-uncovered-http-methods declared but SecurityHandler==null");
+ return;
+ }
+
((ConstraintAware)context.getSecurityHandler()).setDenyUncoveredHttpMethods(true);
}
diff --git a/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppContextTest.java b/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppContextTest.java
index 9935948af8e..b8841a4b015 100644
--- a/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppContextTest.java
+++ b/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppContextTest.java
@@ -44,6 +44,7 @@ import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
import org.eclipse.jetty.server.handler.HandlerList;
import org.eclipse.jetty.server.handler.HotSwapHandler;
+import org.eclipse.jetty.servlet.ErrorPageErrorHandler;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.util.resource.Resource;
import org.eclipse.jetty.util.resource.ResourceCollection;
@@ -218,6 +219,34 @@ public class WebAppContextTest
}
}
+ @Test
+ public void testNullSessionAndSecurityHandler() throws Exception
+ {
+ Server server = new Server(0);
+ HandlerList handlers = new HandlerList();
+ ContextHandlerCollection contexts = new ContextHandlerCollection();
+ WebAppContext context = new WebAppContext(null, null, null, null, null, new ErrorPageErrorHandler(),
+ ServletContextHandler.NO_SESSIONS|ServletContextHandler.NO_SECURITY);
+ context.setContextPath("/");
+ context.setBaseResource(Resource.newResource("./src/test/webapp"));
+ server.setHandler(handlers);
+ handlers.addHandler(contexts);
+ contexts.addHandler(context);
+
+ LocalConnector connector = new LocalConnector(server);
+ server.addConnector(connector);
+
+ try
+ {
+ server.start();
+ Assert.assertTrue(context.isAvailable());
+ }
+ finally
+ {
+ server.stop();
+ }
+ }
+
class ServletA extends GenericServlet
{
@Override
diff --git a/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketPolicy.java b/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketPolicy.java
index 9208ae3c106..657367bcf12 100644
--- a/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketPolicy.java
+++ b/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketPolicy.java
@@ -260,9 +260,15 @@ public class WebSocketPolicy
}
/**
- * Get the maximum size of a binary message during parsing/generating.
+ * Get the maximum size of a binary message during parsing.
*
- * Binary messages over this maximum will result in a close code 1009 {@link StatusCode#MESSAGE_TOO_LARGE}
+ * This is a memory conservation option, memory over this limit will not be
+ * allocated by Jetty for handling binary messages. This applies to individual frames,
+ * whole message handling, and partial message handling.
+ *
+ *
+ * Binary messages over this maximum will result in a close code 1009 {@link StatusCode#MESSAGE_TOO_LARGE}
+ *
*
* @return the maximum size of a binary message
*/
@@ -282,9 +288,15 @@ public class WebSocketPolicy
}
/**
- * Get the maximum size of a text message during parsing/generating.
+ * Get the maximum size of a text message during parsing.
*
- * Text messages over this maximum will result in a close code 1009 {@link StatusCode#MESSAGE_TOO_LARGE}
+ * This is a memory conservation option, memory over this limit will not be
+ * allocated by Jetty for handling text messages. This applies to individual frames,
+ * whole message handling, and partial message handling.
+ *
+ *
+ * Text messages over this maximum will result in a close code 1009 {@link StatusCode#MESSAGE_TOO_LARGE}
+ *
*
* @return the maximum size of a text message.
*/
@@ -372,7 +384,7 @@ public class WebSocketPolicy
/**
* The maximum size of a binary message buffer.
*
- * Used ONLY for stream based message writing.
+ * Used ONLY for stream based binary message writing.
*
* @param size
* the maximum size of the binary message buffer
@@ -403,9 +415,15 @@ public class WebSocketPolicy
}
/**
- * The maximum size of a binary message during parsing/generating.
+ * The maximum size of a binary message during parsing.
*
- * Binary messages over this maximum will result in a close code 1009 {@link StatusCode#MESSAGE_TOO_LARGE}
+ * This is a memory conservation option, memory over this limit will not be
+ * allocated by Jetty for handling binary messages. This applies to individual frames,
+ * whole message handling, and partial message handling.
+ *
+ *
+ * Binary messages over this maximum will result in a close code 1009 {@link StatusCode#MESSAGE_TOO_LARGE}
+ *
*
* @param size
* the maximum allowed size of a binary message.
@@ -420,7 +438,7 @@ public class WebSocketPolicy
/**
* The maximum size of a text message buffer.
*
- * Used ONLY for stream based message writing.
+ * Used ONLY for stream based text message writing.
*
* @param size
* the maximum size of the text message buffer
@@ -450,9 +468,15 @@ public class WebSocketPolicy
}
/**
- * The maximum size of a text message during parsing/generating.
+ * The maximum size of a text message during parsing.
*
- * Text messages over this maximum will result in a close code 1009 {@link StatusCode#MESSAGE_TOO_LARGE}
+ * This is a memory conservation option, memory over this limit will not be
+ * allocated by Jetty for handling text messages. This applies to individual frames,
+ * whole message handling, and partial message handling.
+ *
+ *
+ * Text messages over this maximum will result in a close code 1009 {@link StatusCode#MESSAGE_TOO_LARGE}
+ *
*
* @param size
* the maximum allowed size of a text message.
diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java
index 9b09d34804f..2f34b617069 100644
--- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java
+++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java
@@ -258,7 +258,7 @@ public abstract class CompressExtension extends AbstractExtension
private static boolean supplyInput(Inflater inflater, ByteBuffer buf)
{
- if (buf.remaining() <= 0)
+ if (buf == null || buf.remaining() <= 0)
{
if (LOG.isDebugEnabled())
{
@@ -298,7 +298,7 @@ public abstract class CompressExtension extends AbstractExtension
private static boolean supplyInput(Deflater deflater, ByteBuffer buf)
{
- if (buf.remaining() <= 0)
+ if (buf == null || buf.remaining() <= 0)
{
if (LOG.isDebugEnabled())
{
@@ -451,6 +451,10 @@ public abstract class CompressExtension extends AbstractExtension
// the heap if the payload is a huge mapped file.
Frame frame = entry.frame;
ByteBuffer data = frame.getPayload();
+
+ if(data == null)
+ data = BufferUtil.EMPTY_BUFFER;
+
int remaining = data.remaining();
int outputLength = Math.max(256,data.remaining());
if (LOG.isDebugEnabled())
diff --git a/jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/jsr356/DelayedStartClientTest.java b/jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/jsr356/DelayedStartClientTest.java
index 58a29e1ccec..a66db939468 100644
--- a/jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/jsr356/DelayedStartClientTest.java
+++ b/jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/jsr356/DelayedStartClientTest.java
@@ -97,10 +97,6 @@ public class DelayedStartClientTest
QueuedThreadPool qtp = (QueuedThreadPool) executor;
threadNames.add(qtp.getName());
}
- else
- {
- System.err.println("### Executor: " + executor);
- }
}
for (ContainerLifeCycle child : container.getBeans(ContainerLifeCycle.class))
diff --git a/jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/jsr356/DelayedStartClientOnServerTest.java b/jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/jsr356/DelayedStartClientOnServerTest.java
index 70232069a48..2451060d1fa 100644
--- a/jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/jsr356/DelayedStartClientOnServerTest.java
+++ b/jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/jsr356/DelayedStartClientOnServerTest.java
@@ -385,10 +385,6 @@ public class DelayedStartClientOnServerTest
QueuedThreadPool qtp = (QueuedThreadPool) executor;
threadNames.add(qtp.getName());
}
- else
- {
- System.err.println("### Executor: " + executor);
- }
}
for (ContainerLifeCycle child : container.getBeans(ContainerLifeCycle.class))
diff --git a/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java b/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
index db12d70f446..953fddb40aa 100644
--- a/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
+++ b/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
@@ -51,6 +51,7 @@ import java.util.concurrent.atomic.AtomicReference;
import org.eclipse.jetty.util.LazyList;
import org.eclipse.jetty.util.Loader;
+import org.eclipse.jetty.util.MultiException;
import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.util.TypeUtil;
import org.eclipse.jetty.util.component.LifeCycle;
@@ -531,6 +532,8 @@ public class XmlConfiguration
if (LOG.isDebugEnabled())
LOG.debug("XML " + (obj != null?obj.toString():oClass.getName()) + "." + name + "(" + value + ")");
+ MultiException me = new MultiException();
+
// Try for trivial match
try
{
@@ -541,6 +544,7 @@ public class XmlConfiguration
catch (IllegalArgumentException | IllegalAccessException | NoSuchMethodException e)
{
LOG.ignore(e);
+ me.add(e);
}
// Try for native match
@@ -555,6 +559,7 @@ public class XmlConfiguration
catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException | NoSuchMethodException e)
{
LOG.ignore(e);
+ me.add(e);
}
// Try a field
@@ -570,11 +575,13 @@ public class XmlConfiguration
catch (NoSuchFieldException e)
{
LOG.ignore(e);
+ me.add(e);
}
// Search for a match by trying all the set methods
Method[] sets = oClass.getMethods();
Method set = null;
+ String types = null;
for (int s = 0; sets != null && s < sets.length; s++)
{
if (sets[s].getParameterCount()!=1)
@@ -582,6 +589,7 @@ public class XmlConfiguration
Class[] paramTypes = sets[s].getParameterTypes();
if (name.equals(sets[s].getName()))
{
+ types = types==null?paramTypes[0].getName():(types+","+paramTypes[0].getName());
// lets try it
try
{
@@ -592,6 +600,7 @@ public class XmlConfiguration
catch (IllegalArgumentException | IllegalAccessException e)
{
LOG.ignore(e);
+ me.add(e);
}
try
@@ -606,6 +615,7 @@ public class XmlConfiguration
catch (IllegalAccessException e)
{
LOG.ignore(e);
+ me.add(e);
}
}
}
@@ -636,11 +646,21 @@ public class XmlConfiguration
catch (NoSuchMethodException | IllegalAccessException | InstantiationException e)
{
LOG.ignore(e);
+ me.add(e);
}
}
// No Joy
- throw new NoSuchMethodException(oClass + "." + name + "(" + vClass[0] + ")");
+ String message = oClass + "." + name + "(" + vClass[0] + ")";
+ if (types!=null)
+ message += ". Found setters for "+types;
+ throw new NoSuchMethodException(message)
+ {
+ {
+ for (int i=0; i");
+ TestConfiguration tc = new TestConfiguration();
+ try
+ {
+ configuration.configure(tc);
+ Assert.fail();
+ }
+ catch(NoSuchMethodException e)
+ {
+ assertThat(e.getMessage(),containsString("Found setters for int"));
+ }
+ }
+
@Test
public void testListConstructorArg() throws Exception
{
diff --git a/pom.xml b/pom.xml
index 067fc3c4a41..99d3dc81967 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,6 @@
org.eclipse.jetty
jetty-project
10.0.0-SNAPSHOT
-
Jetty :: Project
The Eclipse Jetty Project
pom
@@ -21,7 +20,7 @@
1.6.6
1.2
1.1.3.v20160715
- 8.5.9.1
+ 8.5.20
4.0.0-b07
4.0.0-b07
@@ -395,7 +394,7 @@
org.apache.maven.plugins
maven-dependency-plugin
- 3.0.1
+ 3.0.2
org.apache.maven.plugins
@@ -593,7 +592,7 @@
org.eclipse.jetty.toolchain
jetty-version-maven-plugin
- 2.4
+ 2.5
org.jacoco
@@ -1112,6 +1111,20 @@
true
false
true
+ Tag for release: jetty-${project.version}
+
+ jetty-documentation/.*
+ examples/.*
+ aggregates/.*
+ .*/test-.*
+ .*/.*-test/.*
+ .*/.*-tests/.*
+ .*/src/test/.*
+ \.git.*
+ .*\.md$
+ .*\.txt$
+ Jenkinsfile
+
@@ -1121,12 +1134,8 @@
aggregate-site
diff --git a/tests/test-http-client-transport/pom.xml b/tests/test-http-client-transport/pom.xml
index 78832e43f19..d4e41dfe06d 100644
--- a/tests/test-http-client-transport/pom.xml
+++ b/tests/test-http-client-transport/pom.xml
@@ -21,6 +21,20 @@
[1.8,1.9)
+
+
+ org.eclipse.jetty
+ jetty-alpn-openjdk8-client
+ ${project.version}
+ test
+
+
+ org.eclipse.jetty
+ jetty-alpn-openjdk8-server
+ ${project.version}
+ test
+
+
@@ -92,6 +106,12 @@
+
+ org.eclipse.jetty
+ jetty-jmx
+ ${project.version}
+ test
+
org.eclipse.jetty
jetty-servlet
@@ -110,12 +130,6 @@
${project.version}
test
-
- org.eclipse.jetty
- jetty-alpn-server
- ${project.version}
- test
-
org.eclipse.jetty.http2
http2-http-client-transport
diff --git a/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/AbstractTest.java b/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/AbstractTest.java
index 911b38f59e9..a4cfa47104b 100644
--- a/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/AbstractTest.java
+++ b/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/AbstractTest.java
@@ -18,6 +18,7 @@
package org.eclipse.jetty.http.client;
+import java.lang.management.ManagementFactory;
import java.util.ArrayList;
import java.util.List;
@@ -34,6 +35,7 @@ import org.eclipse.jetty.http2.client.HTTP2Client;
import org.eclipse.jetty.http2.client.http.HttpClientTransportOverHTTP2;
import org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory;
import org.eclipse.jetty.http2.server.HTTP2ServerConnectionFactory;
+import org.eclipse.jetty.jmx.MBeanContainer;
import org.eclipse.jetty.server.ConnectionFactory;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.HttpConfiguration;
@@ -114,7 +116,10 @@ public abstract class AbstractTest
sslContextFactory.setCipherComparator(HTTP2Cipher.COMPARATOR);
QueuedThreadPool serverThreads = new QueuedThreadPool();
serverThreads.setName("server");
+ serverThreads.setDetailedDump(true);
server = new Server(serverThreads);
+ MBeanContainer mbeanContainer = new MBeanContainer(ManagementFactory.getPlatformMBeanServer());
+ server.addBean(mbeanContainer);
connector = newServerConnector(server);
server.addConnector(connector);
server.setHandler(handler);
@@ -130,10 +135,13 @@ public abstract class AbstractTest
{
QueuedThreadPool clientThreads = new QueuedThreadPool();
clientThreads.setName("client");
+ clientThreads.setDetailedDump(true);
client = newHttpClient(provideClientTransport(transport), sslContextFactory);
client.setExecutor(clientThreads);
client.setSocketAddressResolver(new SocketAddressResolver.Sync());
client.start();
+ if (server != null)
+ server.addBean(client);
}
protected ConnectionFactory[] provideServerConnectionFactory(Transport transport)
diff --git a/tests/test-sessions/test-infinispan-sessions/pom.xml b/tests/test-sessions/test-infinispan-sessions/pom.xml
index a2367057b61..606de7470d3 100644
--- a/tests/test-sessions/test-infinispan-sessions/pom.xml
+++ b/tests/test-sessions/test-infinispan-sessions/pom.xml
@@ -84,6 +84,12 @@
org.eclipse.jetty
jetty-infinispan
${project.version}
+
+
+ org.infinispan
+ infinispan-core
+
+
org.eclipse.jetty
@@ -96,10 +102,16 @@
jetty-test-helper
test
+
+ org.infinispan
+ infinispan-core
+ 9.1.0.Final
+ test
+
org.infinispan
infinispan-client-hotrod
- 7.1.1.Final
+ 9.1.0.Final
test
diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredLastAccessTimeTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredLastAccessTimeTest.java
index e3780be7c3b..14fd6b2e0d9 100644
--- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredLastAccessTimeTest.java
+++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredLastAccessTimeTest.java
@@ -19,26 +19,27 @@
package org.eclipse.jetty.server.session;
import org.eclipse.jetty.session.infinispan.InfinispanSessionDataStoreFactory;
+import org.eclipse.jetty.toolchain.test.JDK;
import org.junit.AfterClass;
import org.junit.BeforeClass;
public class ClusteredLastAccessTimeTest extends AbstractClusteredLastAccessTimeTest
{
- public static InfinispanTestSupport __testSupport;
-
-
+ public static InfinispanTestSupport __testSupport;
+
@BeforeClass
public static void setup () throws Exception
{
- __testSupport = new InfinispanTestSupport();
- __testSupport.setUseFileStore(true);
- __testSupport.setup();
+ __testSupport = new InfinispanTestSupport();
+ __testSupport.setUseFileStore(true);
+ __testSupport.setup();
}
@AfterClass
public static void teardown () throws Exception
{
- __testSupport.teardown();
+ if (__testSupport != null)
+ __testSupport.teardown();
}
@@ -58,5 +59,4 @@ public class ClusteredLastAccessTimeTest extends AbstractClusteredLastAccessTime
factory.setCache(__testSupport.getCache());
return factory;
}
-
}
diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredSessionScavengingTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredSessionScavengingTest.java
index e574172302f..538d6c15491 100644
--- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredSessionScavengingTest.java
+++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredSessionScavengingTest.java
@@ -20,6 +20,7 @@
package org.eclipse.jetty.server.session;
import org.eclipse.jetty.session.infinispan.InfinispanSessionDataStoreFactory;
+import org.eclipse.jetty.toolchain.test.JDK;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -30,7 +31,6 @@ import org.junit.BeforeClass;
*/
public class ClusteredSessionScavengingTest extends AbstractClusteredSessionScavengingTest
{
-
public static InfinispanTestSupport __testSupport;
@BeforeClass
@@ -44,7 +44,8 @@ public class ClusteredSessionScavengingTest extends AbstractClusteredSessionScav
@AfterClass
public static void teardown () throws Exception
{
- __testSupport.teardown();
+ if (__testSupport != null)
+ __testSupport.teardown();
}
diff --git a/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/webapps/test.xml b/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/webapps/test.xml
index 4a978e9fa79..10347114ba0 100644
--- a/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/webapps/test.xml
+++ b/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/webapps/test.xml
@@ -71,9 +71,7 @@ detected.