Author: markt
Date: Sun Apr 10 10:45:46 2011
New Revision: 1090770

URL: http://svn.apache.org/viewvc?rev=1090770&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=27988
Improve reporting of missing files

Modified:
    tomcat/tc5.5.x/trunk/STATUS.txt
    
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/DirContextURLConnection.java
    tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1090770&r1=1090769&r2=1090770&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Sun Apr 10 10:45:46 2011
@@ -45,12 +45,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: markt, kfujino
   -1:
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=27988
-  Improve reporting of missing files
-  http://svn.apache.org/viewvc?rev=1076212&view=rev
-  +1: markt, kfujino, kkolinko
-  -1:
-
 * Fix possible threading issue in JSP compilation when development mode is
   enabled
   http://svn.apache.org/viewvc?rev=1078409&view=rev

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/DirContextURLConnection.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/DirContextURLConnection.java?rev=1090770&r1=1090769&r2=1090770&view=diff
==============================================================================
--- 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/DirContextURLConnection.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/DirContextURLConnection.java
 Sun Apr 10 10:45:46 2011
@@ -262,7 +262,8 @@ public class DirContextURLConnection 
         if (object != null)
             return object;
         
-        throw new FileNotFoundException();
+        throw new FileNotFoundException(
+                getURL() == null ? "null" : getURL().toString());
         
     }
     
@@ -295,7 +296,8 @@ public class DirContextURLConnection 
             connect();
         
         if (resource == null) {
-            throw new FileNotFoundException();
+            throw new FileNotFoundException(
+                    getURL() == null ? "null" : getURL().toString());
         } else {
             // Reopen resource
             try {
@@ -333,7 +335,8 @@ public class DirContextURLConnection 
         }
         
         if ((resource == null) && (collection == null)) {
-            throw new FileNotFoundException();
+            throw new FileNotFoundException(
+                    getURL() == null ? "null" : getURL().toString());
         }
         
         Vector result = new Vector();
@@ -347,7 +350,8 @@ public class DirContextURLConnection 
                 }
             } catch (NamingException e) {
                 // Unexpected exception
-                throw new FileNotFoundException();
+                throw new FileNotFoundException(
+                        getURL() == null ? "null" : getURL().toString());
             }
         }
         

Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=1090770&r1=1090769&r2=1090770&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Sun Apr 10 
10:45:46 2011
@@ -43,6 +43,9 @@
   <subsection name="Catalina">
     <changelog>
       <fix>
+        <bug>27988</bug>: Improve reporting of missing files. (markt)
+      </fix>
+      <fix>
         <bug>28852</bug>: Add URL encoding where missing to parameters in URLs
         presented by Ant tasks to the Manager application. Based on a patch by
         Stephane Bailliez. (mark) 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to