tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/common ChannelUn.java
Date Thu, 25 Apr 2002 18:24:18 GMT
costin      02/04/25 11:24:18

  Modified:    jk/java/org/apache/jk/common ChannelUn.java
  Log:
  Add checks - if jni/apr is not available, nothing will happen at shutdown
  ( since nothing happened at startup )
  
  Revision  Changes    Path
  1.15      +5 -3      jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelUn.java
  
  Index: ChannelUn.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelUn.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ChannelUn.java	18 Apr 2002 19:12:36 -0000	1.14
  +++ ChannelUn.java	25 Apr 2002 18:24:18 -0000	1.15
  @@ -182,9 +182,11 @@
   
       public void destroy() throws IOException {
           try {
  -            tp.shutdown();
  -
  -            apr.unSocketClose(gPool, unixListenSocket,3);
  +            if( tp != null )
  +                tp.shutdown();
  +            
  +            if(apr !=null ) 
  +                apr.unSocketClose(gPool, unixListenSocket,3);
           } catch(Exception e) {
               e.printStackTrace();
           }
  
  
  

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


Mime
View raw message