Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project

This commit is contained in:
Greg Wilkins 2011-07-22 11:04:11 +10:00
commit ee02bb4b17
4 changed files with 23 additions and 25 deletions

View File

@ -6,6 +6,7 @@ jetty-7.5.0-SNAPSHOT
+ 352176 xml parsing on startElement should be more flexible on using qName or localName + 352176 xml parsing on startElement should be more flexible on using qName or localName
+ 352421 HttpURI paths beginning with '.' + 352421 HttpURI paths beginning with '.'
+ 352684 Implemented spinning thread analyzer + 352684 Implemented spinning thread analyzer
+ 352786 GzipFilter fails to pass parameters to GzipResponseWrapper
jetty-7.4.4.v20110707 July 7th 2011 jetty-7.4.4.v20110707 July 7th 2011
+ 308851 Converted all jetty-client module tests to JUnit 4 + 308851 Converted all jetty-client module tests to JUnit 4

View File

@ -39,8 +39,8 @@ public class ThreadMonitor extends AbstractLifeCycle implements Runnable
private Method findDeadlockedThreadsMethod; private Method findDeadlockedThreadsMethod;
private Thread _runner; private Thread _runner;
private boolean _done;
private Logger _logger; private Logger _logger;
private volatile boolean _done = true;
private Map<Long,ExtThreadInfo> _extInfo; private Map<Long,ExtThreadInfo> _extInfo;
@ -76,23 +76,6 @@ public class ThreadMonitor extends AbstractLifeCycle implements Runnable
init(); init();
} }
/* ------------------------------------------------------------ */
/**
* @see org.eclipse.jetty.util.component.AbstractLifeCycle#doStart()
*/
public void doStart()
{
_done = false;
_runner = new Thread(this);
_runner.start();
Log.info("Thread Monitor started successfully");
}
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
public int getScanInterval() public int getScanInterval()
{ {
@ -129,6 +112,20 @@ public class ThreadMonitor extends AbstractLifeCycle implements Runnable
_stackDepth = stackDepth; _stackDepth = stackDepth;
} }
/* ------------------------------------------------------------ */
/**
* @see org.eclipse.jetty.util.component.AbstractLifeCycle#doStart()
*/
public void doStart()
{
_done = false;
_runner = new Thread(this);
_runner.start();
Log.info("Thread Monitor started successfully");
}
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
/** /**
* @see org.eclipse.jetty.util.component.AbstractLifeCycle#doStop() * @see org.eclipse.jetty.util.component.AbstractLifeCycle#doStop()

View File

@ -278,9 +278,9 @@ public class GzipHandler extends HandlerWrapper
return new GzipResponseWrapper(request, response) return new GzipResponseWrapper(request, response)
{ {
{ {
_mimeTypes = GzipHandler.this._mimeTypes; setMimeTypes(GzipHandler.this._mimeTypes);
_bufferSize = GzipHandler.this._bufferSize; setBufferSize(GzipHandler.this._bufferSize);
_minGzipSize = GzipHandler.this._minGzipSize; setMinGzipSize(GzipHandler.this._minGzipSize);
} }
@Override @Override

View File

@ -191,9 +191,9 @@ public class GzipFilter extends UserAgentFilter
return new GzipResponseWrapper(request, response) return new GzipResponseWrapper(request, response)
{ {
{ {
_mimeTypes = GzipFilter.this._mimeTypes; setMimeTypes(GzipFilter.this._mimeTypes);
_bufferSize = GzipFilter.this._bufferSize; setBufferSize(GzipFilter.this._bufferSize);
_minGzipSize = GzipFilter.this._minGzipSize; setMinGzipSize(GzipFilter.this._minGzipSize);
} }
@Override @Override