Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org Received: (qmail 52699 invoked from network); 4 Apr 2003 22:21:40 -0000 Received: from exchange.sun.com (192.18.33.10) by daedalus.apache.org with SMTP; 4 Apr 2003 22:21:40 -0000 Received: (qmail 9155 invoked by uid 97); 4 Apr 2003 22:23:36 -0000 Delivered-To: qmlist-jakarta-archive-tomcat-dev@nagoya.betaversion.org Received: (qmail 9148 invoked from network); 4 Apr 2003 22:23:36 -0000 Received: from daedalus.apache.org (HELO apache.org) (208.185.179.12) by nagoya.betaversion.org with SMTP; 4 Apr 2003 22:23:36 -0000 Received: (qmail 51773 invoked by uid 500); 4 Apr 2003 22:21:31 -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 51762 invoked by uid 500); 4 Apr 2003 22:21:31 -0000 Received: (qmail 51759 invoked from network); 4 Apr 2003 22:21:31 -0000 Received: from icarus.apache.org (208.185.179.13) by daedalus.apache.org with SMTP; 4 Apr 2003 22:21:31 -0000 Received: (qmail 69939 invoked by uid 1052); 4 Apr 2003 22:21:35 -0000 Date: 4 Apr 2003 22:21:35 -0000 Message-ID: <20030404222135.69938.qmail@icarus.apache.org> From: costin@apache.org To: jakarta-tomcat-connectors-cvs@apache.org Subject: cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 CoyoteConnector.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 2003/04/04 14:21:35 Modified: coyote/src/java/org/apache/coyote/tomcat5 CoyoteConnector.java Log: Deal with the various registration orders. Revision Changes Path 1.23 +26 -14 jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteConnector.java Index: CoyoteConnector.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteConnector.java,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- CoyoteConnector.java 25 Mar 2003 17:47:46 -0000 1.22 +++ CoyoteConnector.java 4 Apr 2003 22:21:35 -0000 1.23 @@ -526,7 +526,10 @@ * Connector. */ public Container getContainer() { - + if( container==null ) { + // Lazy - maybe it was added later + findContainer(); + } return (container); } @@ -1078,7 +1081,6 @@ } - /** * Initialize this connector (create ServerSocket here!) */ @@ -1269,6 +1271,9 @@ try { Registry.getRegistry().unregisterComponent(new ObjectName(domain,"type", "Mapper")); + Registry.getRegistry().unregisterComponent(new ObjectName(domain + + ":type=protocolHandler,className=" + + protocolHandlerClassName)); } catch (MalformedObjectNameException e) { log.info( "Error unregistering mapper ", e); } @@ -1391,18 +1396,13 @@ log.error( "Unregistering - can't stop", t); } } - - public void init() throws Exception { - - if( this.getService() != null ) { - log.info( "Already configured" ); - return; - } - if( container==null ) { + + private void findContainer() { + try { // Register to the service ObjectName parentName=new ObjectName( domain + ":" + "type=Service"); - + log.info("Adding to " + parentName ); if( mserver.isRegistered(parentName )) { mserver.invoke(parentName, "addConnector", new Object[] { this }, @@ -1418,16 +1418,28 @@ Object obj=mserver.getAttribute(engName, "managedResource"); log.info("Found engine " + obj + " " + obj.getClass()); container=(Container)obj; - + // Internal initialize - we now have the Engine initialize(); - + log.info("Initialized"); // As a side effect we'll get the container field set // Also initialize will be called return; } + } catch( Exception ex ) { + log.error( "Error finding container " + ex); + } + } + + public void init() throws Exception { + if( this.getService() != null ) { + log.info( "Already configured" ); + return; + } + if( container==null ) { + findContainer(); } } --------------------------------------------------------------------- To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org