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

VERSION.txt

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

jetty-monitor/src/main/java/org/eclipse/jetty/monitor/ThreadMonitor.java

@@ -39,8 +39,8 @@ public class ThreadMonitor extends AbstractLifeCycle implements Runnable
     private Method findDeadlockedThreadsMethod;
     
     private Thread _runner;
-    private boolean _done;
     private Logger _logger;
+    private volatile boolean _done = true;
 
     private Map<Long,ExtThreadInfo> _extInfo;
     
@@ -76,23 +76,6 @@ public class ThreadMonitor extends AbstractLifeCycle implements Runnable
         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()
     {
@@ -129,6 +112,20 @@ public class ThreadMonitor extends AbstractLifeCycle implements Runnable
         _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()

jetty-server/src/main/java/org/eclipse/jetty/server/handler/GzipHandler.java

@@ -278,9 +278,9 @@ public class GzipHandler extends HandlerWrapper
         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

jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java

@@ -191,9 +191,9 @@ public class GzipFilter extends UserAgentFilter
         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