Fixes #338092 (ProxyServlet leaks memory).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2830 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
parent
f5cb64ff54
commit
8020110283
|
@ -23,6 +23,7 @@ jetty-7.3.1-SNAPSHOT
|
||||||
+ JETTY-1335 HttpClient's SelectConnector clean-up
|
+ JETTY-1335 HttpClient's SelectConnector clean-up
|
||||||
+ JETTY-1333 HttpClient _timeout and _soTimeout is messed up
|
+ JETTY-1333 HttpClient _timeout and _soTimeout is messed up
|
||||||
+ 338068 Leaking ConstraintMappings on redeploy
|
+ 338068 Leaking ConstraintMappings on redeploy
|
||||||
|
+ 338092 ProxyServlet leaks memory
|
||||||
|
|
||||||
jetty-7.3.0.v20110203 3 February 2011
|
jetty-7.3.0.v20110203 3 February 2011
|
||||||
+ JETTY-1259 NullPointerException in JDBCSessionIdManager when invalidating session (further update)
|
+ JETTY-1259 NullPointerException in JDBCSessionIdManager when invalidating session (further update)
|
||||||
|
|
|
@ -13,7 +13,6 @@
|
||||||
|
|
||||||
package org.eclipse.jetty.servlets;
|
package org.eclipse.jetty.servlets;
|
||||||
|
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.io.OutputStream;
|
import java.io.OutputStream;
|
||||||
|
@ -28,7 +27,6 @@ import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.StringTokenizer;
|
import java.util.StringTokenizer;
|
||||||
|
|
||||||
import javax.servlet.Servlet;
|
import javax.servlet.Servlet;
|
||||||
import javax.servlet.ServletConfig;
|
import javax.servlet.ServletConfig;
|
||||||
import javax.servlet.ServletContext;
|
import javax.servlet.ServletContext;
|
||||||
|
@ -160,6 +158,18 @@ public class ProxyServlet implements Servlet
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void destroy()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
_client.stop();
|
||||||
|
}
|
||||||
|
catch (Exception x)
|
||||||
|
{
|
||||||
|
_log.debug(x);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/* ------------------------------------------------------------ */
|
/* ------------------------------------------------------------ */
|
||||||
/**
|
/**
|
||||||
* Helper function to process a parameter value containing a list
|
* Helper function to process a parameter value containing a list
|
||||||
|
@ -559,14 +569,6 @@ public class ProxyServlet implements Servlet
|
||||||
return "Proxy Servlet";
|
return "Proxy Servlet";
|
||||||
}
|
}
|
||||||
|
|
||||||
/* (non-Javadoc)
|
|
||||||
* @see javax.servlet.Servlet#destroy()
|
|
||||||
*/
|
|
||||||
public void destroy()
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Transparent Proxy.
|
* Transparent Proxy.
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in New Issue