cvs commit: xml-rpc/src/java/org/apache/xmlrpc WebServer.java

[dlr]

dlr         2002/10/09 17:14:02

  Modified:    src/java/org/apache/xmlrpc WebServer.java
  Log:
  A better implementation of CVS rev 1.19 for history's sake.
  
  Revision  Changes    Path
  1.20      +10 -7     xml-rpc/src/java/org/apache/xmlrpc/WebServer.java
  
  Index: WebServer.java
  ===================================================================
  RCS file: /home/cvs/xml-rpc/src/java/org/apache/xmlrpc/WebServer.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -u -r1.19 -r1.20
  --- WebServer.java    9 Oct 2002 23:52:53 -0000       1.19
  +++ WebServer.java    10 Oct 2002 00:14:02 -0000      1.20
  @@ -64,6 +64,7 @@
   import java.net.InetAddress;
   import java.net.ServerSocket;
   import java.net.Socket;
  +import java.net.UnknownHostException;
   import java.util.EmptyStackException;
   import java.util.Stack;
   import java.util.StringTokenizer;
  @@ -248,16 +249,18 @@
           InetAddress addr = address;
           if (addr == null)
           {
  -            InetAddress[] addrs = InetAddress.getAllByName("127.0.0.1");
  -            if (addrs.length > 0 &&
  -                "127.0.0.1".equals(addrs[0].getHostAddress()))
  +            try
  +            {
  +                addr = InetAddress.getByName("127.0.0.1");
  +            }
  +            catch (UnknownHostException useDefault)
               {
  -                addr = addrs[0];
  +                // This is not necessarilly the loopback interface on
  +                // a multi-homed host.
               }
  -            else
  +
  +            if (addr == null)
               {
  -                // This is not necessarilly the loopback interface -- it
  -                // could be one of your external network interfaces.
                   addr = InetAddress.getLocalHost();
               }
           }