[freenet-cvs] r19637 - trunk/freenet/src/freenet/clients/http

[t...@freenetproject.org]

Author: toad
Date: 2008-04-30 21:45:07 +0000 (Wed, 30 Apr 2008)
New Revision: 19637

Modified:
   trunk/freenet/src/freenet/clients/http/QueueToadlet.java
Log:
Fix 0002280: insert of key via queue page fails with invalid key

Modified: trunk/freenet/src/freenet/clients/http/QueueToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/QueueToadlet.java    2008-04-30 
21:19:55 UTC (rev 19636)
+++ trunk/freenet/src/freenet/clients/http/QueueToadlet.java    2008-04-30 
21:45:07 UTC (rev 19637)
@@ -307,6 +307,12 @@
                                        fcp.forceStorePersistentRequests();
                                } catch (IdentifierCollisionException e) {
                                        e.printStackTrace();
+                               } catch (MalformedURLException e) {
+                                       
writeError(L10n.getString("QueueToadlet.errorInvalidURI"), 
L10n.getString("QueueToadlet.errorInvalidURIToU"), ctx);
+                                       return;
+                               } catch (FileNotFoundException e) {
+                                       
this.writeError(L10n.getString("QueueToadlet.errorNoFileOrCannotRead"), 
L10n.getString("QueueToadlet.errorAccessDeniedFile", new String[]{ "file" }, 
new String[]{ target }), ctx);
+                                       return;
                                } catch (NotAllowedException e) {
                                        
this.writeError(L10n.getString("QueueToadlet.errorAccessDenied"), 
L10n.getString("QueueToadlet.errorAccessDeniedFile", new String[]{ "file" }, 
new String[]{ file.getName() }), ctx);
                                        return;
@@ -335,6 +341,12 @@
                                        fcp.forceStorePersistentRequests();
                                } catch (IdentifierCollisionException e) {
                                        e.printStackTrace();
+                               } catch (MalformedURLException e) {
+                                       
writeError(L10n.getString("QueueToadlet.errorInvalidURI"), 
L10n.getString("QueueToadlet.errorInvalidURIToU"), ctx);
+                                       return;
+                               } catch (FileNotFoundException e) {
+                                       
this.writeError(L10n.getString("QueueToadlet.errorNoFileOrCannotRead"), 
L10n.getString("QueueToadlet.errorAccessDeniedFile", new String[]{ "file" }, 
new String[]{ file.toString() }), ctx);
+                                       return;
                                }
                                writePermanentRedirect(ctx, "Done", "/queue/");
                                return;