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

344513 Attempting to set ConfigurationClasses in jetty-web.xml causes NPE 

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3056 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Michael Gorovoy 2011-05-02 23:21:12 +00:00
parent 4e2d8d9c18
commit 69ee5b641d
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
VERSION.txt
View File

@ -7,7 +7,8 @@ jetty-7.4.1-SNAPSHOT
+ 343482 refactored overlay deployer layout to use WAR layout
+ 343923 flush timeouts applied to outer loop
+ 344059 Websockets draft-07
+ 344067 - Add support for OSGi fragment bundles to add static resources to web-bundles
+ 344067 Add support for OSGi fragment bundles to add static resources to web-bundles
+ 344513 Attempting to set ConfigurationClasses in jetty-web.xml causes NPE
+ JETTY-954 WebAppContext eats any start exceptions instead of stopping the server load
jetty-7.4.0.v20110414

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

@ -813,7 +813,7 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL
*/
public void setConfigurationClasses(String[] configurations)
{
if (isStarted())
if (isRunning())
throw new IllegalStateException();
_configurationClasses = configurations==null?null:(String[])configurations.clone();
_configurationClassesSet = true;
@ -826,7 +826,7 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL
*/
public void setConfigurations(Configuration[] configurations)
{
if (isStarted())
if (isRunning())
throw new IllegalStateException();
_configurations = configurations==null?null:(Configuration[])configurations.clone();
_configurationsSet = true;