[freenet-cvs] r11310 - trunk/freenet/src/freenet/clients/http/filter

[t...@freenetproject.org]

Author: toad
Date: 2006-12-08 22:06:07 +0000 (Fri, 08 Dec 2006)
New Revision: 11310

Modified:
   trunk/freenet/src/freenet/clients/http/filter/GenericReadFilterCallback.java
Log:
Better feedback in comments

Modified: 
trunk/freenet/src/freenet/clients/http/filter/GenericReadFilterCallback.java
===================================================================
--- 
trunk/freenet/src/freenet/clients/http/filter/GenericReadFilterCallback.java    
    2006-12-08 21:12:38 UTC (rev 11309)
+++ 
trunk/freenet/src/freenet/clients/http/filter/GenericReadFilterCallback.java    
    2006-12-08 22:06:07 UTC (rev 11310)
@@ -104,6 +104,7 @@
                // Try as an absolute URI

                String rpath = uri.getPath();
+               
                if(rpath != null) {
                        if(logMINOR) Logger.minor(this, "Resolved URI (rpath 
absolute): "+rpath);

@@ -118,6 +119,9 @@
                                // Not a FreenetURI
                                if(logMINOR) Logger.minor(this, "Malformed URL 
(a): "+e, e);
                                reason = "Malformed URL (absolute): 
"+e.getMessage();
+                               if(e.getMessage() == null) {
+                                       reason = "Could not be parsed as a 
Freenet URI";
+                               }
                        }
                }

@@ -138,7 +142,10 @@
                        if(logMINOR) Logger.minor(this, "Malformed URL (b): 
"+e, e);
                        if(reason.length() > 0)
                                reason += " , ";
-                       reason += "Malformed URL (relative): "+e.getMessage();
+                       if(e.getMessage() != null)
+                               reason += "Malformed URL (relative): 
"+e.getMessage();
+                       else
+                               reason += "Could not be parsed as a (relative) 
Freenet URI";
                        // Not a FreenetURI
                }