You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2008/04/27 18:14:17 UTC
svn commit: r651976 - in /tomcat/trunk/java/org/apache/tomcat/util/net:
NioBlockingSelector.java NioEndpoint.java NioSelectorPool.java
PoolTcpEndpoint.java SSLImplementation.java ServerSocketFactory.java
jsse/JSSESupport.java
Author: markt
Date: Sun Apr 27 09:14:06 2008
New Revision: 651976
URL: http://svn.apache.org/viewvc?rev=651976&view=rev
Log:
Code clean up o.a.t.util.net.
Generics and unused code.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
tomcat/trunk/java/org/apache/tomcat/util/net/PoolTcpEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java
tomcat/trunk/java/org/apache/tomcat/util/net/ServerSocketFactory.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java?rev=651976&r1=651975&r2=651976&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java Sun Apr 27 09:14:06 2008
@@ -193,7 +193,8 @@
protected class BlockPoller extends Thread {
protected boolean run = true;
protected Selector selector = null;
- protected ConcurrentLinkedQueue events = new ConcurrentLinkedQueue();
+ protected ConcurrentLinkedQueue<Runnable> events =
+ new ConcurrentLinkedQueue<Runnable>();
public void disable() { run = false; selector.wakeup();}
protected AtomicInteger wakeupCounter = new AtomicInteger(0);
public void cancelKey(final NioChannel socket, final SelectionKey key) {
@@ -284,7 +285,7 @@
boolean result = false;
Runnable r = null;
result = (events.size() > 0);
- while ( (r = (Runnable)events.poll()) != null ) {
+ while ( (r = events.poll()) != null ) {
r.run();
result = true;
}
@@ -320,12 +321,13 @@
continue;
}
- Iterator iterator = keyCount > 0 ? selector.selectedKeys().iterator() : null;
+ Iterator<SelectionKey> iterator =
+ keyCount > 0 ? selector.selectedKeys().iterator() : null;
// Walk through the collection of ready keys and dispatch
// any active event.
while (run && iterator != null && iterator.hasNext()) {
- SelectionKey sk = (SelectionKey) iterator.next();
+ SelectionKey sk = iterator.next();
KeyAttachment attachment = (KeyAttachment)sk.attachment();
try {
attachment.access();
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=651976&r1=651975&r2=651976&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Sun Apr 27 09:14:06 2008
@@ -1383,7 +1383,7 @@
//synchronized (events) {
Runnable r = null;
result = (events.size() > 0);
- while ( (r = (Runnable)events.poll()) != null ) {
+ while ( (r = events.poll()) != null ) {
try {
r.run();
if ( r instanceof PollerEvent ) {
@@ -1497,11 +1497,12 @@
//either we timed out or we woke up, process events first
if ( keyCount == 0 ) hasEvents = (hasEvents | events());
- Iterator iterator = keyCount > 0 ? selector.selectedKeys().iterator() : null;
+ Iterator<SelectionKey> iterator =
+ keyCount > 0 ? selector.selectedKeys().iterator() : null;
// Walk through the collection of ready keys and dispatch
// any active event.
while (iterator != null && iterator.hasNext()) {
- SelectionKey sk = (SelectionKey) iterator.next();
+ SelectionKey sk = iterator.next();
KeyAttachment attachment = (KeyAttachment)sk.attachment();
attachment.access();
iterator.remove();
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java?rev=651976&r1=651975&r2=651976&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java Sun Apr 27 09:14:06 2008
@@ -60,7 +60,8 @@
protected boolean enabled = true;
protected AtomicInteger active = new AtomicInteger(0);
protected AtomicInteger spare = new AtomicInteger(0);
- protected ConcurrentLinkedQueue<Selector> selectors = new ConcurrentLinkedQueue<Selector>();
+ protected ConcurrentLinkedQueue<Selector> selectors =
+ new ConcurrentLinkedQueue<Selector>();
protected Selector getSharedSelector() throws IOException {
if (SHARED && SHARED_SELECTOR == null) {
@@ -293,7 +294,7 @@
return sharedSelectorTimeout;
}
- public ConcurrentLinkedQueue getSelectors() {
+ public ConcurrentLinkedQueue<Selector> getSelectors() {
return selectors;
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/PoolTcpEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/PoolTcpEndpoint.java?rev=651976&r1=651975&r2=651976&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/PoolTcpEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/PoolTcpEndpoint.java Sun Apr 27 09:14:06 2008
@@ -103,11 +103,13 @@
/* The background thread. */
private Thread thread = null;
/* Available processors. */
- private Stack workerThreads = new Stack();
+ private Stack<MasterSlaveWorkerThread> workerThreads =
+ new Stack<MasterSlaveWorkerThread>();
private int curThreads = 0;
private int maxThreads = 20;
/* All processors which have been created. */
- private Vector created = new Vector();
+ private Vector<MasterSlaveWorkerThread> created =
+ new Vector<MasterSlaveWorkerThread>();
public PoolTcpEndpoint() {
@@ -569,7 +571,7 @@
synchronized (workerThreads) {
if (workerThreads.size() > 0) {
- return ((MasterSlaveWorkerThread) workerThreads.pop());
+ return (workerThreads.pop());
}
if ((maxThreads > 0) && (curThreads < maxThreads)) {
return (newWorkerThread());
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java?rev=651976&r1=651975&r2=651976&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java Sun Apr 27 09:14:06 2008
@@ -67,7 +67,7 @@
if( JSSEImplementationClass.equals(className) ) {
return new org.apache.tomcat.util.net.jsse.JSSEImplementation();
}
- Class clazz=Class.forName(className);
+ Class<?> clazz=Class.forName(className);
return (SSLImplementation)clazz.newInstance();
} catch (Exception e){
if(logger.isDebugEnabled())
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/ServerSocketFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/ServerSocketFactory.java?rev=651976&r1=651975&r2=651976&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/ServerSocketFactory.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/ServerSocketFactory.java Sun Apr 27 09:14:06 2008
@@ -55,7 +55,8 @@
//
private static ServerSocketFactory theFactory;
- protected Hashtable attributes=new Hashtable();
+ protected Hashtable<String, Object> attributes =
+ new Hashtable<String, Object>();
/**
* Constructor is used only by subclasses.
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java?rev=651976&r1=651975&r2=651976&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java Sun Apr 27 09:14:06 2008
@@ -159,7 +159,7 @@
if(log.isTraceEnabled())
log.trace("Reading for try #" +i);
try {
- int x = in.read(b);
+ in.read(b);
} catch(SSLException sslex) {
log.info("SSL Error getting client Certs",sslex);
throw sslex;
@@ -213,7 +213,7 @@
return null;
StringBuffer buf=new StringBuffer("");
for(int x=0; x<ssl_session.length; x++) {
- String digit=Integer.toHexString((int)ssl_session[x]);
+ String digit=Integer.toHexString(ssl_session[x]);
if (digit.length()<2) buf.append('0');
if (digit.length()>2) digit=digit.substring(digit.length()-2);
buf.append(digit);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org