tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fha...@apache.org
Subject svn commit: r424441 - /tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Date Fri, 21 Jul 2006 20:15:36 GMT
Author: fhanik
Date: Fri Jul 21 13:15:35 2006
New Revision: 424441

URL: http://svn.apache.org/viewvc?rev=424441&view=rev
Log:
Remove old APR references

Modified:
    tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=424441&r1=424440&r2=424441&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Fri Jul 21 13:15:35
2006
@@ -24,8 +24,6 @@
 import java.nio.channels.Selector;
 import java.nio.channels.ServerSocketChannel;
 import java.nio.channels.SocketChannel;
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.Set;
@@ -33,11 +31,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.tomcat.jni.Error;
-import org.apache.tomcat.jni.Library;
-import org.apache.tomcat.jni.Poll;
 import org.apache.tomcat.jni.SSL;
-import org.apache.tomcat.jni.Status;
 import org.apache.tomcat.util.res.StringManager;
 
 /**
@@ -545,9 +539,9 @@
             // Initialize SSL
             // FIXME: one per VM call ?
             if ("on".equalsIgnoreCase(SSLEngine)) {
-                SSL.initialize(null);
+                //SSL.initialize(null);
             } else {
-                SSL.initialize(SSLEngine);
+                //SSL.initialize(SSLEngine);
             }
             // SSL protocol
             int value = SSL.SSL_PROTOCOL_ALL;
@@ -844,24 +838,6 @@
             workers.push(workerThread);
             curThreadsBusy--;
             workers.notify();
-        }
-    }
-
-
-    /**
-     * Allocate a new poller of the specified size.
-     */
-    protected long allocatePoller(int size, long pool, int timeout) {
-        try {
-            return Poll.create(size, pool, 0, timeout * 1000);
-        } catch (Error e) {
-            if (Status.APR_STATUS_IS_EINVAL(e.getError())) {
-                log.info(sm.getString("endpoint.poll.limitedpollsize", "" + size));
-                return 0;
-            } else {
-                log.error(sm.getString("endpoint.poll.initfail"), e);
-                return -1;
-            }
         }
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message