Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm
Precedence: bulk
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r554238 -
 /webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/HttpCoreNIOListener.java
Date: Sat, 07 Jul 2007 18:28:20 -0000
To: axis2-cvs@ws.apache.org
From: asankha@apache.org
Message-Id: <20070707182820.AF5AD1A981A@eris.apache.org>

Author: asankha
Date: Sat Jul  7 11:28:19 2007
New Revision: 554238

URL: http://svn.apache.org/viewvc?view=rev&rev=554238
Log:
fix AXIS2-2919 by uncommenting the lines that I had commented out to compile in 1.4

Thus Axis2 now requires to be compiled using a JDK 1.5 or later, but supports 1.4 for the runtime

Modified:
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/HttpCoreNIOListener.java

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/HttpCoreNIOListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/HttpCoreNIOListener.java?view=diff&rev=554238&r1=554237&r2=554238
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/HttpCoreNIOListener.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/HttpCoreNIOListener.java Sat Jul  7 11:28:19 2007
@@ -36,7 +36,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.http.impl.nio.reactor.DefaultListeningIOReactor;
-//import org.apache.http.impl.nio.reactor.SSLIOSessionHandler;
+import org.apache.http.impl.nio.reactor.SSLIOSessionHandler;
 import org.apache.http.nio.NHttpServiceHandler;
 import org.apache.http.nio.reactor.IOEventDispatch;
 import org.apache.http.nio.reactor.ListeningIOReactor;
@@ -66,7 +66,7 @@
     /** SSLContext if this listener is a SSL listener */
     private SSLContext sslContext = null;
     /** The SSL session handler that manages client authentication etc */
-//    private SSLIOSessionHandler sslIOSessionHandler = null;
+    private SSLIOSessionHandler sslIOSessionHandler = null;
 
     /**
      * configure and start the IO reactor on the specified port
@@ -83,7 +83,7 @@
 
         NHttpServiceHandler handler = new ServerHandler(cfgCtx, params, sslContext != null);
         IOEventDispatch ioEventDispatch = getEventDispatch(
-            handler, sslContext, /*sslIOSessionHandler,*/ params);
+            handler, sslContext, sslIOSessionHandler, params);
 
         try {
             ioReactor.listen(new InetSocketAddress(port));
@@ -98,7 +98,7 @@
 
     protected IOEventDispatch getEventDispatch(
         NHttpServiceHandler handler, SSLContext sslContext, 
-        /*SSLIOSessionHandler sslioSessionHandler,*/ HttpParams params) {
+        SSLIOSessionHandler sslioSessionHandler, HttpParams params) {
         return new PlainServerIOEventDispatch(handler, params);
     }
 

---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org