Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 45587 invoked from network); 20 Jan 2009 17:20:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 20 Jan 2009 17:20:22 -0000 Received: (qmail 53341 invoked by uid 500); 20 Jan 2009 17:20:22 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 53292 invoked by uid 500); 20 Jan 2009 17:20:22 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 53283 invoked by uid 99); 20 Jan 2009 17:20:22 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Jan 2009 09:20:22 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Jan 2009 17:20:20 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BB5C5238889C; Tue, 20 Jan 2009 09:19:58 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r736042 - in /geronimo/server/trunk/framework/modules: geronimo-jmx-remoting/src/main/java/org/apache/geronimo/jmxremoting/JMXConnector.java geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/GeronimoRMIClientSocketFactory.java Date: Tue, 20 Jan 2009 17:19:58 -0000 To: scm@geronimo.apache.org From: dwoods@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090120171958.BB5C5238889C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dwoods Date: Tue Jan 20 09:19:57 2009 New Revision: 736042 URL: http://svn.apache.org/viewvc?rev=736042&view=rev Log: GERONIMO-4518 Can't shutdown the server when host was set to 127.0.0.1 in config-substitutions.properties. Applied patch from Shawn Jiang. Modified: geronimo/server/trunk/framework/modules/geronimo-jmx-remoting/src/main/java/org/apache/geronimo/jmxremoting/JMXConnector.java geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/GeronimoRMIClientSocketFactory.java Modified: geronimo/server/trunk/framework/modules/geronimo-jmx-remoting/src/main/java/org/apache/geronimo/jmxremoting/JMXConnector.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-jmx-remoting/src/main/java/org/apache/geronimo/jmxremoting/JMXConnector.java?rev=736042&r1=736041&r2=736042&view=diff ============================================================================== --- geronimo/server/trunk/framework/modules/geronimo-jmx-remoting/src/main/java/org/apache/geronimo/jmxremoting/JMXConnector.java (original) +++ geronimo/server/trunk/framework/modules/geronimo-jmx-remoting/src/main/java/org/apache/geronimo/jmxremoting/JMXConnector.java Tue Jan 20 09:19:57 2009 @@ -188,7 +188,7 @@ } else { log.warn("Starting unauthenticating JMXConnector for " + jmxServiceURL); } - RMIClientSocketFactory socketFactory = new GeronimoRMIClientSocketFactory(2 * 60 * 1000, 5 * 60 * 1000); + RMIClientSocketFactory socketFactory = new GeronimoRMIClientSocketFactory(host, 2 * 60 * 1000, 5 * 60 * 1000); env.put(RMIConnectorServer.RMI_CLIENT_SOCKET_FACTORY_ATTRIBUTE, socketFactory); RMIServerSocketFactory serverSocketFactory = new GeronimoRMIServerSocketFactory(host); env.put(RMIConnectorServer.RMI_SERVER_SOCKET_FACTORY_ATTRIBUTE, serverSocketFactory); Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/GeronimoRMIClientSocketFactory.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/GeronimoRMIClientSocketFactory.java?rev=736042&r1=736041&r2=736042&view=diff ============================================================================== --- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/GeronimoRMIClientSocketFactory.java (original) +++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/GeronimoRMIClientSocketFactory.java Tue Jan 20 09:19:57 2009 @@ -31,15 +31,20 @@ private int connectionTimeout = -1; private int readTimeout = -1; + private String host=null; - public GeronimoRMIClientSocketFactory(int connectionTimeout, int readTimeout) { + public GeronimoRMIClientSocketFactory(String _host,int connectionTimeout, int readTimeout) { + this.host=_host; this.connectionTimeout = connectionTimeout; this.readTimeout = readTimeout; } - public Socket createSocket(String host, int port) throws IOException { + public Socket createSocket(String _host, int port) throws IOException { Socket socket = new Socket(); - socket.bind(null); + socket.bind(null); + if(host==null){ + host=_host; + } socket.connect(new InetSocketAddress(host, port), (this.connectionTimeout > 0) ? this.connectionTimeout : 0); if (this.readTimeout >= 0) { socket.setSoTimeout(this.readTimeout);