Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org Received: (qmail 31177 invoked from network); 25 Apr 2002 18:24:44 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 25 Apr 2002 18:24:44 -0000 Received: (qmail 7157 invoked by uid 97); 25 Apr 2002 18:24:25 -0000 Delivered-To: qmlist-jakarta-archive-tomcat-dev@jakarta.apache.org Received: (qmail 7139 invoked by uid 97); 25 Apr 2002 18:24:24 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 7113 invoked by uid 97); 25 Apr 2002 18:24:24 -0000 Date: 25 Apr 2002 18:24:18 -0000 Message-ID: <20020425182418.18014.qmail@icarus.apache.org> From: costin@apache.org To: jakarta-tomcat-connectors-cvs@apache.org Subject: cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/common ChannelUn.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N 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: For additional commands, e-mail: