Author: markt
Date: Sat Mar 6 09:42:33 2010
New Revision: 919725
URL: http://svn.apache.org/viewvc?rev=919725&view=rev
Log:
Fix some Eclipse warnings
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java?rev=919725&r1=919724&r2=919725&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
Sat Mar 6 09:42:33 2010
@@ -92,7 +92,7 @@
* @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 @@
* @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);
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=919725&r1=919724&r2=919725&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Sat Mar 6
09:42:33 2010
@@ -42,6 +42,7 @@
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 @@
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 @@
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;
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=919725&r1=919724&r2=919725&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Sat Mar 6
09:42:33 2010
@@ -42,6 +42,7 @@
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 @@
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 @@
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;
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=919725&r1=919724&r2=919725&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Sat Mar
6 09:42:33 2010
@@ -54,6 +54,7 @@
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 @@
// 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 @@
}
}
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 @@
}
}
if (certs != null) {
- request.setAttribute(AprEndpoint.CERTIFICATE_KEY,
certs);
+
request.setAttribute(AbstractEndpoint.CERTIFICATE_KEY, certs);
}
}
} catch (Exception e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
