From 58a959403d9ea4ed38be7d90283fc0f3dd8e6013 Mon Sep 17 00:00:00 2001
From: reger <reger18@arcor.de>
Date: Sat, 27 Feb 2016 03:44:43 +0100
Subject: [PATCH] fix mixed logfactory in UrlProxyServlet, Class doesn't use
functions of declared ancestor, change to extend on httpservlet
---
source/net/yacy/http/servlets/UrlProxyServlet.java | 6 +++---
source/net/yacy/http/servlets/YaCyProxyServlet.java | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/source/net/yacy/http/servlets/UrlProxyServlet.java b/source/net/yacy/http/servlets/UrlProxyServlet.java
index f4c54a08a..911e8903a 100644
--- a/source/net/yacy/http/servlets/UrlProxyServlet.java
+++ b/source/net/yacy/http/servlets/UrlProxyServlet.java
@@ -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;
diff --git a/source/net/yacy/http/servlets/YaCyProxyServlet.java b/source/net/yacy/http/servlets/YaCyProxyServlet.java
index 66a8fe4af..174272bb9 100644
--- a/source/net/yacy/http/servlets/YaCyProxyServlet.java
+++ b/source/net/yacy/http/servlets/YaCyProxyServlet.java
@@ -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