fix mixed logfactory in UrlProxyServlet,

Class doesn't use functions of declared ancestor, change to extend on httpservlet
This commit is contained in:
reger 2016-02-27 03:44:43 +01:00
parent dc112d0e32
commit 58a959403d
2 changed files with 5 additions and 5 deletions

View File

@ -15,6 +15,7 @@ import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import net.yacy.cora.document.encoding.UTF8;
@ -32,7 +33,6 @@ import net.yacy.server.http.ChunkedInputStream;
import net.yacy.server.http.HTTPDProxyHandler;
import org.eclipse.jetty.continuation.Continuation;
import org.eclipse.jetty.continuation.ContinuationSupport;
import org.eclipse.jetty.proxy.ProxyServlet;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
@ -75,7 +75,7 @@ import org.jsoup.select.Elements;
*
* This class is linked to YaCy within jetty using the defaults/web.xml configuration
*/
public class UrlProxyServlet extends ProxyServlet implements Servlet {
public class UrlProxyServlet extends HttpServlet implements Servlet {
private static final long serialVersionUID = 4900000000000001121L;
private String _stopProxyText = null;
@ -341,7 +341,7 @@ public class UrlProxyServlet extends ProxyServlet implements Servlet {
return true;
}
} catch (PatternSyntaxException ex) {
this._log.warn("wrong ip pattern in url proxy config", ex.getMessage() );
ConcurrentLog.warn("PROXY", "wrong ip pattern in url proxy config " + ex.getMessage() );
}
}
return false;

View File

@ -18,6 +18,7 @@ import javax.servlet.Servlet;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@ -38,7 +39,6 @@ import net.yacy.server.http.HTTPDProxyHandler;
import org.eclipse.jetty.continuation.Continuation;
import org.eclipse.jetty.continuation.ContinuationSupport;
import org.eclipse.jetty.proxy.ProxyServlet;
/**
* Servlet to implement proxy via url parameter "/proxy.html?url=xyz_urltoproxy"
@ -59,7 +59,7 @@ import org.eclipse.jetty.proxy.ProxyServlet;
* @deprecated since 1.81 use {@link UrlProxyServlet} instead.
*/
@Deprecated //use UrlProxyServlet instead
public class YaCyProxyServlet extends ProxyServlet implements Servlet {
public class YaCyProxyServlet extends HttpServlet implements Servlet {
private static final long serialVersionUID = 4900000000000001120L;
@Override