revert change to the classloader used in isAvailable

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
This commit is contained in:
Lachlan Roberts 2020-11-09 18:12:50 +11:00
parent 80a824854b
commit 32433b10ad
2 changed files with 4 additions and 2 deletions

View File

@ -20,6 +20,7 @@ package org.eclipse.jetty.websocket.client.config;
import java.util.ServiceLoader;
import org.eclipse.jetty.util.Loader;
import org.eclipse.jetty.webapp.AbstractConfiguration;
import org.eclipse.jetty.webapp.Configuration;
import org.eclipse.jetty.webapp.FragmentConfiguration;
@ -71,7 +72,7 @@ public class JettyWebSocketClientConfiguration extends AbstractConfiguration
{
try
{
return JettyWebSocketClientConfiguration.class.getClassLoader().loadClass(classname) != null;
return Loader.loadClass(classname) != null;
}
catch (Throwable e)
{

View File

@ -20,6 +20,7 @@ package org.eclipse.jetty.websocket.server.config;
import java.util.ServiceLoader;
import org.eclipse.jetty.util.Loader;
import org.eclipse.jetty.webapp.AbstractConfiguration;
import org.eclipse.jetty.webapp.Configuration;
import org.eclipse.jetty.webapp.FragmentConfiguration;
@ -75,7 +76,7 @@ public class JettyWebSocketConfiguration extends AbstractConfiguration
{
try
{
return JettyWebSocketConfiguration.class.getClassLoader().loadClass(classname) != null;
return Loader.loadClass(classname) != null;
}
catch (Throwable e)
{