You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@apache.org on 2002/01/06 10:14:07 UTC

cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/common ChannelUnixSocket.java

costin      02/01/06 01:14:07

  Modified:    jk/java/org/apache/jk/common ChannelUnixSocket.java
  Log:
  A small change to get it to compile with jikes ( same class in 2 files ).
  
  We probably need a base class for socket-based channels ( a single file would
  be a bad idea since all but the plain socket will probably depend on
  native code - or on 1.4 )
  
  Revision  Changes    Path
  1.2       +7 -7      jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelUnixSocket.java
  
  Index: ChannelUnixSocket.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelUnixSocket.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ChannelUnixSocket.java	5 Jan 2002 10:03:42 -0000	1.1
  +++ ChannelUnixSocket.java	6 Jan 2002 09:14:07 -0000	1.2
  @@ -188,7 +188,7 @@
   
           // Run a thread that will accept connections.
           tp.start();
  -        SocketAcceptor acceptAjp=new SocketAcceptor(  this );
  +        USocketAcceptor acceptAjp=new USocketAcceptor(  this );
           tp.runIt( acceptAjp);
       }
   
  @@ -295,8 +295,8 @@
               try {
                   Endpoint ep=this.createEndpoint();
                   this.accept(ep);
  -                SocketConnection ajpConn=
  -                    new SocketConnection(this, ep);
  +                USocketConnection ajpConn=
  +                    new USocketConnection(this, ep);
                   tp.runIt( ajpConn );
               } catch( Exception ex ) {
                   ex.printStackTrace();
  @@ -328,10 +328,10 @@
   
   }
   
  -class SocketAcceptor implements ThreadPoolRunnable {
  +class USocketAcceptor implements ThreadPoolRunnable {
       ChannelUnixSocket wajp;
       
  -    SocketAcceptor(ChannelUnixSocket wajp ) {
  +    USocketAcceptor(ChannelUnixSocket wajp ) {
           this.wajp=wajp;
       }
   
  @@ -344,11 +344,11 @@
       }
   }
   
  -class SocketConnection implements ThreadPoolRunnable {
  +class USocketConnection implements ThreadPoolRunnable {
       ChannelUnixSocket wajp;
       Endpoint ep;
   
  -    SocketConnection(ChannelUnixSocket wajp, Endpoint ep) {
  +    USocketConnection(ChannelUnixSocket wajp, Endpoint ep) {
           this.wajp=wajp;
           this.ep=ep;
       }
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>