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

Issue #963 

Remove debug and fix NPE
This commit is contained in:
Jan Bartel 2016-10-07 10:58:12 +11:00
parent f7f49fa96e
commit 97d18665ef
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud/gcloud.xml
View File

@ -10,7 +10,7 @@
<Arg><Ref refid="Server"/></Arg> <Arg><Ref refid="Server"/></Arg>
<Arg> <Arg>
<Call class="org.eclipse.jetty.util.StringUtil" name="csvSplit"> <Call class="org.eclipse.jetty.util.StringUtil" name="csvSplit">
<Arg><Property name="gcloud.addServerClasses"><Default>file:${jetty.base}/lib/gcloud</Default></Property></Arg> <Arg><Property name="gcloud.addServerClasses"><Default>file:<Property name="jetty.base"/>/lib/gcloud</Default></Property></Arg>
</Call> </Call>
</Arg> </Arg>
</Call> </Call>

3
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppClassLoader.java
View File

@ -474,9 +474,6 @@ public class WebAppClassLoader extends URLClassLoader
@Override @Override
protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException
{ {
LOG.setDebugEnabled(true);
WebAppContext.LOG.setDebugEnabled(true);
synchronized (getClassLoadingLock(name)) synchronized (getClassLoadingLock(name))
{ {
ClassNotFoundException ex= null; ClassNotFoundException ex= null;

12
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
View File

@ -1642,10 +1642,12 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
public static void addServerClasses(Server server,String... pattern ) public static void addServerClasses(Server server,String... pattern )
{ {
// look for a Server attribute with the list of Server classes if (pattern == null || pattern.length == 0)
// to apply to every web application. If not present, use our defaults. return;
Object o = server.getAttribute(SERVER_SRV_CLASSES);
// look for a Server attribute with the list of Server classes
// to apply to every web application. If not present, use our defaults.
Object o = server.getAttribute(SERVER_SRV_CLASSES);
if (o instanceof ClasspathPattern) if (o instanceof ClasspathPattern)
{ {
((ClasspathPattern)o).add(pattern); ((ClasspathPattern)o).add(pattern);
@ -1666,10 +1668,12 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
public static void addSystemClasses(Server server,String... pattern ) public static void addSystemClasses(Server server,String... pattern )
{ {
if (pattern == null || pattern.length == 0)
return;
// look for a Server attribute with the list of System classes // look for a Server attribute with the list of System classes
// to apply to every web application. If not present, use our defaults. // to apply to every web application. If not present, use our defaults.
Object o = server.getAttribute(SERVER_SYS_CLASSES); Object o = server.getAttribute(SERVER_SYS_CLASSES);
if (o instanceof ClasspathPattern) if (o instanceof ClasspathPattern)
{ {
((ClasspathPattern)o).add(pattern); ((ClasspathPattern)o).add(pattern);