From 41ce7f4db00bd74402af39fdb704108ebf6f8b0e Mon Sep 17 00:00:00 2001 From: markt Date: Sat, 6 Mar 2010 09:42:33 +0000 Subject: [PATCH] Fix some Eclipse warnings git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@919725 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java | 4 ++-- java/org/apache/coyote/ajp/AjpAprProcessor.java | 9 +++++---- java/org/apache/coyote/ajp/AjpProcessor.java | 9 +++++---- java/org/apache/coyote/http11/Http11AprProcessor.java | 11 ++++++----- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java b/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java index f3a5fd92d..393b66756 100644 --- a/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java +++ b/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java @@ -92,7 +92,7 @@ public class LazyReplicatedMap extends AbstractReplicatedMap { * @param initialCapacity int - the size of this map, see HashMap */ public LazyReplicatedMap(MapOwner owner, Channel channel, long timeout, String mapContextName, int initialCapacity, ClassLoader[] cls) { - super(owner, channel,timeout,mapContextName,initialCapacity, LazyReplicatedMap.DEFAULT_LOAD_FACTOR, Channel.SEND_OPTIONS_DEFAULT, cls); + super(owner, channel,timeout,mapContextName,initialCapacity, AbstractReplicatedMap.DEFAULT_LOAD_FACTOR, Channel.SEND_OPTIONS_DEFAULT, cls); } /** @@ -102,7 +102,7 @@ public class LazyReplicatedMap extends AbstractReplicatedMap { * @param mapContextName String - unique name for this map, to allow multiple maps per channel */ public LazyReplicatedMap(MapOwner owner, Channel channel, long timeout, String mapContextName, ClassLoader[] cls) { - super(owner, channel,timeout,mapContextName, LazyReplicatedMap.DEFAULT_INITIAL_CAPACITY,LazyReplicatedMap.DEFAULT_LOAD_FACTOR,Channel.SEND_OPTIONS_DEFAULT, cls); + super(owner, channel,timeout,mapContextName, AbstractReplicatedMap.DEFAULT_INITIAL_CAPACITY,AbstractReplicatedMap.DEFAULT_LOAD_FACTOR,Channel.SEND_OPTIONS_DEFAULT, cls); } diff --git a/java/org/apache/coyote/ajp/AjpAprProcessor.java b/java/org/apache/coyote/ajp/AjpAprProcessor.java index c51d4c4e5..7159bcd96 100644 --- a/java/org/apache/coyote/ajp/AjpAprProcessor.java +++ b/java/org/apache/coyote/ajp/AjpAprProcessor.java @@ -42,6 +42,7 @@ import org.apache.tomcat.util.buf.HexUtils; import org.apache.tomcat.util.buf.MessageBytes; import org.apache.tomcat.util.http.HttpMessages; import org.apache.tomcat.util.http.MimeHeaders; +import org.apache.tomcat.util.net.AbstractEndpoint; import org.apache.tomcat.util.net.AprEndpoint; import org.apache.tomcat.util.res.StringManager; @@ -572,7 +573,7 @@ public class AjpAprProcessor implements ActionHook { log.error(sm.getString("ajpprocessor.certs.fail"), e); return; } - request.setAttribute(AprEndpoint.CERTIFICATE_KEY, jsseCerts); + request.setAttribute(AbstractEndpoint.CERTIFICATE_KEY, jsseCerts); } } else if (actionCode == ActionCode.ACTION_REQ_HOST_ATTRIBUTE) { @@ -786,19 +787,19 @@ public class AjpAprProcessor implements ActionHook { case Constants.SC_A_SSL_CIPHER : request.scheme().setString("https"); requestHeaderMessage.getBytes(tmpMB); - request.setAttribute(AprEndpoint.CIPHER_SUITE_KEY, + request.setAttribute(AbstractEndpoint.CIPHER_SUITE_KEY, tmpMB.toString()); break; case Constants.SC_A_SSL_SESSION : request.scheme().setString("https"); requestHeaderMessage.getBytes(tmpMB); - request.setAttribute(AprEndpoint.SESSION_ID_KEY, + request.setAttribute(AbstractEndpoint.SESSION_ID_KEY, tmpMB.toString()); break; case Constants.SC_A_SSL_KEY_SIZE : - request.setAttribute(AprEndpoint.KEY_SIZE_KEY, + request.setAttribute(AbstractEndpoint.KEY_SIZE_KEY, new Integer(requestHeaderMessage.getInt())); break; diff --git a/java/org/apache/coyote/ajp/AjpProcessor.java b/java/org/apache/coyote/ajp/AjpProcessor.java index 7d63fdcf2..48fb25c7f 100644 --- a/java/org/apache/coyote/ajp/AjpProcessor.java +++ b/java/org/apache/coyote/ajp/AjpProcessor.java @@ -42,6 +42,7 @@ import org.apache.tomcat.util.buf.HexUtils; import org.apache.tomcat.util.buf.MessageBytes; import org.apache.tomcat.util.http.HttpMessages; import org.apache.tomcat.util.http.MimeHeaders; +import org.apache.tomcat.util.net.AbstractEndpoint; import org.apache.tomcat.util.net.JIoEndpoint; import org.apache.tomcat.util.res.StringManager; @@ -570,7 +571,7 @@ public class AjpProcessor implements ActionHook { log.error(sm.getString("ajpprocessor.certs.fail"), e); return; } - request.setAttribute(JIoEndpoint.CERTIFICATE_KEY, jsseCerts); + request.setAttribute(AbstractEndpoint.CERTIFICATE_KEY, jsseCerts); } } else if (actionCode == ActionCode.ACTION_REQ_HOST_ATTRIBUTE) { @@ -784,19 +785,19 @@ public class AjpProcessor implements ActionHook { case Constants.SC_A_SSL_CIPHER : request.scheme().setString("https"); requestHeaderMessage.getBytes(tmpMB); - request.setAttribute(JIoEndpoint.CIPHER_SUITE_KEY, + request.setAttribute(AbstractEndpoint.CIPHER_SUITE_KEY, tmpMB.toString()); break; case Constants.SC_A_SSL_SESSION : request.scheme().setString("https"); requestHeaderMessage.getBytes(tmpMB); - request.setAttribute(JIoEndpoint.SESSION_ID_KEY, + request.setAttribute(AbstractEndpoint.SESSION_ID_KEY, tmpMB.toString()); break; case Constants.SC_A_SSL_KEY_SIZE : - request.setAttribute(JIoEndpoint.KEY_SIZE_KEY, + request.setAttribute(AbstractEndpoint.KEY_SIZE_KEY, new Integer(requestHeaderMessage.getInt())); break; diff --git a/java/org/apache/coyote/http11/Http11AprProcessor.java b/java/org/apache/coyote/http11/Http11AprProcessor.java index 4c35bf1ce..e6af29cb4 100644 --- a/java/org/apache/coyote/http11/Http11AprProcessor.java +++ b/java/org/apache/coyote/http11/Http11AprProcessor.java @@ -54,6 +54,7 @@ import org.apache.tomcat.util.buf.HexUtils; import org.apache.tomcat.util.buf.MessageBytes; import org.apache.tomcat.util.http.FastHttpDateFormat; import org.apache.tomcat.util.http.MimeHeaders; +import org.apache.tomcat.util.net.AbstractEndpoint; import org.apache.tomcat.util.net.AprEndpoint; import org.apache.tomcat.util.net.SocketStatus; import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState; @@ -1116,7 +1117,7 @@ public class Http11AprProcessor implements ActionHook { // Cipher suite Object sslO = SSLSocket.getInfoS(socket, SSL.SSL_INFO_CIPHER); if (sslO != null) { - request.setAttribute(AprEndpoint.CIPHER_SUITE_KEY, sslO); + request.setAttribute(AbstractEndpoint.CIPHER_SUITE_KEY, sslO); } // Get client certificate and the certificate chain if present // certLength == -1 indicates an error @@ -1133,16 +1134,16 @@ public class Http11AprProcessor implements ActionHook { } } if (certs != null) { - request.setAttribute(AprEndpoint.CERTIFICATE_KEY, certs); + request.setAttribute(AbstractEndpoint.CERTIFICATE_KEY, certs); } // User key size sslO = new Integer(SSLSocket.getInfoI(socket, SSL.SSL_INFO_CIPHER_USEKEYSIZE)); - request.setAttribute(AprEndpoint.KEY_SIZE_KEY, sslO); + request.setAttribute(AbstractEndpoint.KEY_SIZE_KEY, sslO); // SSL session ID sslO = SSLSocket.getInfoS(socket, SSL.SSL_INFO_SESSION_ID); if (sslO != null) { - request.setAttribute(AprEndpoint.SESSION_ID_KEY, sslO); + request.setAttribute(AbstractEndpoint.SESSION_ID_KEY, sslO); } //TODO provide a hook to enable the SSL session to be // invalidated. Set AprEndpoint.SESSION_MGR req attr @@ -1181,7 +1182,7 @@ public class Http11AprProcessor implements ActionHook { } } if (certs != null) { - request.setAttribute(AprEndpoint.CERTIFICATE_KEY, certs); + request.setAttribute(AbstractEndpoint.CERTIFICATE_KEY, certs); } } } catch (Exception e) { -- 2.11.0