markt 2004/07/25 15:03:04
Modified: catalina/src/share/org/apache/catalina/startup Embedded.java
Log:
Fix bug 13097. Incorrect form of address used in Embedded.
- Patch suggested by David S. Johnson
- I don't have a test case but after reviewing the change history this looks OK.
Also took opportunity to fix some Eclipse warnings.
Revision Changes Path
1.17 +7 -9
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java
Index: Embedded.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Embedded.java 9 Jun 2002 02:19:44 -0000 1.16
+++ Embedded.java 25 Jul 2004 22:03:03 -0000 1.17
@@ -68,8 +68,6 @@
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.net.InetAddress;
-import java.util.Enumeration;
-import java.util.Properties;
import org.apache.tomcat.util.IntrospectionUtils;
@@ -79,7 +77,6 @@
import org.apache.catalina.Engine;
import org.apache.catalina.Host;
import org.apache.catalina.Lifecycle;
-import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Loader;
@@ -522,7 +519,8 @@
if (address != null) {
IntrospectionUtils.setProperty(connector, "address",
- "" + address);
+ "" + address.getHostAddress());
+
}
IntrospectionUtils.setProperty(connector, "port", "" + port);
IntrospectionUtils.setProperty(connector, "useURIValidationHack",
@@ -691,7 +689,7 @@
*/
public String getInfo() {
- return (this.info);
+ return (Embedded.info);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
