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

JETTY-838 Dont log and throw 

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@766 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Greg Wilkins 2009-08-26 09:15:11 +00:00
parent 64f30c1990
commit 28cbed4144
9 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
VERSION.txt
View File

@ -1,5 +1,6 @@
jetty-7.0.0-SNAPSHOT
+ 286911 Clean out cache when recycling HTTP fields
+ JETTY-838 Don't log and throw
+ JETTY-874 Better header full warnings
+ JETTY-960 Support for ldaps
+ JETTY-1081 Handle null content type in GzipFilter

1
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java
View File

@ -755,7 +755,6 @@ public abstract class AbstractConnector extends HttpBuffers implements Connector
}
catch(ThreadDeath e)
{
Log.warn(e);
throw e;
}
catch(Throwable e)

3
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
View File

@ -1169,7 +1169,8 @@ public class ContextHandler extends ScopedHandler implements Attributes, Server.
}
catch (Exception e)
{
Log.warn(e);
Log.warn(e.toString());
Log.debug(e);
throw new IllegalArgumentException(resourceBase);
}
}

2
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandlerCollection.java
View File

@ -279,7 +279,7 @@ public class ContextHandlerCollection extends HandlerCollection
}
catch (Exception e)
{
Log.warn(e);
Log.debug(e);
throw new Error(e);
}
}

3
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
View File

@ -177,7 +177,8 @@ public class ResourceHandler extends AbstractHandler
}
catch (Exception e)
{
Log.warn(e);
Log.warn(e.toString());
Log.debug(e);
throw new IllegalArgumentException(resourceBase);
}
}

5
jetty-server/src/main/java/org/eclipse/jetty/server/ssl/SslSocketConnector.java
View File

@ -472,8 +472,9 @@ public class SslSocketConnector extends SocketConnector implements SslConnector
}
catch (Exception e)
{
Log.warn(Log.EXCEPTION, e);
throw new IOException("Could not create JsseListener: " + e.toString());
Log.warn(e.toString());
Log.debug(e);
throw new IOException("!JsseListener: " + e);
}
return socket;
}

3
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Holder.java
View File

@ -77,7 +77,8 @@ public class Holder extends AbstractLifeCycle
}
catch (Exception e)
{
Log.warn(e);
Log.warn(e.toString());
Log.debug(e);
throw new UnavailableException(e.getMessage(), -1);
}
}

16
jetty-util/src/main/java/org/eclipse/jetty/util/component/AbstractLifeCycle.java
View File

@ -51,21 +51,17 @@ public abstract class AbstractLifeCycle implements LifeCycle
{
if (_state == __STARTED || _state == __STARTING)
return;
Log.debug("Starting {}",this);
setStarting();
doStart();
Log.debug(STARTED+" {}",this);
setStarted();
}
catch (Exception e)
{
Log.debug(FAILED+" " + this,e);
setFailed(e);
throw e;
}
catch (Error e)
{
Log.debug(FAILED+" " + this,e);
setFailed(e);
throw e;
}
@ -82,18 +78,15 @@ public abstract class AbstractLifeCycle implements LifeCycle
return;
setStopping();
doStop();
Log.debug(STOPPED+" {}",this);
setStopped();
}
catch (Exception e)
{
Log.debug(FAILED+" " + this,e);
setFailed(e);
throw e;
}
catch (Error e)
{
Log.debug(FAILED+" " + this,e);
setFailed(e);
throw e;
}
@ -155,6 +148,7 @@ public abstract class AbstractLifeCycle implements LifeCycle
private void setStarted()
{
Log.debug(STARTED+" {}",this);
_state = __STARTED;
if (_listeners != null)
{
@ -167,6 +161,7 @@ public abstract class AbstractLifeCycle implements LifeCycle
private void setStarting()
{
Log.debug("Starting {}",this);
_state = __STARTING;
if (_listeners != null)
{
@ -191,6 +186,7 @@ public abstract class AbstractLifeCycle implements LifeCycle
private void setStopped()
{
Log.debug(STOPPED+" {}",this);
_state = __STOPPED;
if (_listeners != null)
{
@ -201,14 +197,16 @@ public abstract class AbstractLifeCycle implements LifeCycle
}
}
private void setFailed(Throwable error)
private void setFailed(Throwable th)
{
Log.warn(FAILED+" " + this+": "+th);
Log.debug(th);
_state = __FAILED;
if (_listeners != null)
{
for (int i = 0; i < _listeners.length; i++)
{
_listeners[i].lifeCycleFailure(this,error);
_listeners[i].lifeCycleFailure(this,th);
}
}
}

9
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebXmlConfiguration.java
View File

@ -29,14 +29,10 @@ import org.eclipse.jetty.util.resource.Resource;
/**
* Configure by parsing default web.xml and web.xml
*
*
*/
public class WebXmlConfiguration implements Configuration
{
/* ------------------------------------------------------------------------------- */
/**
* Process webdefaults.xml
@ -86,7 +82,6 @@ public class WebXmlConfiguration implements Configuration
/**
* Process web.xml, web-fragment.xml(s), override-web.xml
*
*
*/
public void configure (WebAppContext context) throws Exception
{
@ -106,7 +101,6 @@ public class WebXmlConfiguration implements Configuration
//process web.xml (the effective web.xml???)
processor.processWebXml();
//process override-web.xml
String overrideDescriptor = context.getOverrideDescriptor();
@ -119,7 +113,6 @@ public class WebXmlConfiguration implements Configuration
processor.processOverride();
}
}
public void postConfigure(WebAppContext context) throws Exception
{
@ -129,8 +122,6 @@ public class WebXmlConfiguration implements Configuration
context.setAttribute(WebXmlProcessor.WEBXML_CLASSNAMES, null);
}
/* ------------------------------------------------------------------------------- */
protected Resource findWebXml(WebAppContext context) throws IOException, MalformedURLException
{