Author: markt
Date: Wed Mar 19 16:02:37 2008
New Revision: 639054

URL: http://svn.apache.org/viewvc?rev=639054&view=rev
Log:
Fix bug 44558. Include address in error message if binding fails.

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=639054&r1=639053&r2=639054&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Mar 19 16:02:37 2008
@@ -94,11 +94,6 @@
   +1 : fhanik - I don't think we should support mark/reset, we can supply a 
filter that does it at the app level by wrapping getReader with a reader that 
bufferes
   -1 : 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44558
-  http://svn.apache.org/viewvc?rev=635304&view=rev
-  +1: markt, remm, jfclere
-  -1:
-
 * Add system property docs
   http://svn.apache.org/viewvc?rev=620335&view=rev
   
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/systemprops.xml?r1=627743&r2=627742&pathrev=627743

Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java?rev=639054&r1=639053&r2=639054&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java Wed 
Mar 19 16:02:37 2008
@@ -498,7 +498,11 @@
                     serverSocket = serverSocketFactory.createSocket(port, 
backlog, address);
                 }
             } catch (BindException be) {
-                throw new BindException(be.getMessage() + ":" + port);
+                if (address == null)
+                    throw new BindException(be.getMessage() + "<null>:" + 
port);
+                else
+                    throw new BindException(be.getMessage() + " " +
+                            address.toString() + ":" + port);
             }
         }
         //if( serverTimeout >= 0 )

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=639054&r1=639053&r2=639054&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Mar 19 16:02:37 2008
@@ -70,6 +70,10 @@
         Fix possible ArrayIndexOutOfBoundsException. Patch provided by Charles 
R
         Caldarale. (markt/jim)
       </fix>
+      <update>
+        <bug>44558</bug>: Improve error message so address is included if
+        binding fails.
+      </update>
     </changelog>
   </subsection>
   <subsection name="Jasper">



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to