[freenet-cvs] r19698 - trunk/plugins/KeyExplorer

[sa...@freenetproject.org]

Author: saces
Date: 2008-05-03 14:02:15 +0000 (Sat, 03 May 2008)
New Revision: 19698

Modified:
   trunk/plugins/KeyExplorer/KeyExplorer.java
Log:
catch cast exception (USK) and reply with an error msg.

Modified: trunk/plugins/KeyExplorer/KeyExplorer.java
===================================================================
--- trunk/plugins/KeyExplorer/KeyExplorer.java  2008-05-03 13:40:26 UTC (rev 
19697)
+++ trunk/plugins/KeyExplorer/KeyExplorer.java  2008-05-03 14:02:15 UTC (rev 
19698)
@@ -96,7 +96,7 @@
                                return;

                        } catch (MalformedURLException e) {
-                               sendError(replysender, 5, "malformed freenet 
uri");
+                               sendError(replysender, 5, "Malformed freenet 
uri: "+e.getMessage());
                                return;
                        } catch (LowLevelGetException e) {
                                sendError(replysender, 6, "Get failed: " + 
e.toString());
@@ -129,7 +129,12 @@
        }

        private GetResult simpleGet(FreenetURI uri) throws 
MalformedURLException, LowLevelGetException {
-               ClientKey ck = (ClientKey) BaseClientKey.getBaseKey(uri);
+               ClientKey ck;
+               try {
+                       ck = (ClientKey) BaseClientKey.getBaseKey(uri);
+               } catch (ClassCastException cce) {
+                       throw new MalformedURLException("Not a supported 
freenet uri: "+uri);
+               }
                VerySimpleGetter vsg = new VerySimpleGetter((short) 1, 
m_pr.getNode().clientCore.requestStarters.chkFetchScheduler, m_pr
                                
.getNode().clientCore.requestStarters.sskFetchScheduler, uri, null);
                VerySimpleGet vs = new VerySimpleGet(ck, 3, 
m_pr.getHLSimpleClient().getFetchContext(), vsg);