Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-03-02 20:09:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

372256: fix if clause doing an || instead of && and thus always calling instanceOf on null values

Browse Source
This commit is contained in:
Thomas Becker 2012-02-22 19:04:45 +01:00 committed by Jesse McConnell
parent 19fae56d6d
commit 8de385992e
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -576,6 +576,7 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL
* @return Returns the Override Descriptor. * @return Returns the Override Descriptor.
* @deprecated use {@link #getOverrideDescriptors()} * @deprecated use {@link #getOverrideDescriptors()}
*/ */
@Deprecated
public String getOverrideDescriptor() public String getOverrideDescriptor()
{ {
if (_overrideDescriptors.size()!=1) if (_overrideDescriptors.size()!=1)
@ -687,21 +688,27 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL
private void loadServerClasses() private void loadServerClasses()
{ {
if (_serverClasses != null) if (_serverClasses != null)
{
return; return;
}
//look for a Server attribute with the list of Server classes // look for a Server attribute with the list of Server 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.
Server server = getServer(); Server server = getServer();
if (server != null) if (server != null)
{ {
Object serverClasses = server.getAttribute(SERVER_SRV_CLASSES); Object serverClasses = server.getAttribute(SERVER_SRV_CLASSES);
if (serverClasses != null || serverClasses instanceof String[]) if (serverClasses != null && serverClasses instanceof String[])
{
_serverClasses = new ClasspathPattern((String[])serverClasses); _serverClasses = new ClasspathPattern((String[])serverClasses);
} }
}
if (_serverClasses == null) if (_serverClasses == null)
{
_serverClasses = new ClasspathPattern(__dftServerClasses); _serverClasses = new ClasspathPattern(__dftServerClasses);
} }
}
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
/** /**
@ -874,6 +881,7 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL
* @param overrideDescriptor The overrideDescritpor to set. * @param overrideDescriptor The overrideDescritpor to set.
* @deprecated use {@link #setOverrideDescriptors(List)} * @deprecated use {@link #setOverrideDescriptors(List)}
*/ */
@Deprecated
public void setOverrideDescriptor(String overrideDescriptor) public void setOverrideDescriptor(String overrideDescriptor)
{ {
_overrideDescriptors.clear(); _overrideDescriptors.clear();
@ -961,7 +969,7 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL
@Override @Override
public void addEventListener(EventListener listener) public void addEventListener(EventListener listener)
{ {
setEventListeners((EventListener[])LazyList.addToArray(getEventListeners(), listener, EventListener.class)); setEventListeners(LazyList.addToArray(getEventListeners(), listener, EventListener.class));
} }
@ -1218,6 +1226,7 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL
public class Context extends ServletContextHandler.Context public class Context extends ServletContextHandler.Context
{ {
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
@Override
public URL getResource(String path) throws MalformedURLException public URL getResource(String path) throws MalformedURLException
{ {
Resource resource=WebAppContext.this.getResource(path); Resource resource=WebAppContext.this.getResource(path);