[freenet-cvs] r10161 - trunk/freenet/src/freenet/client/async

[t...@freenetproject.org]

Author: toad
Date: 2006-08-17 14:13:24 +0000 (Thu, 17 Aug 2006)
New Revision: 10161

Modified:
   trunk/freenet/src/freenet/client/async/SingleBlockInserter.java
Log:
Lazy encode on SingleBlockInserter's.

Modified: trunk/freenet/src/freenet/client/async/SingleBlockInserter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SingleBlockInserter.java     
2006-08-17 13:52:11 UTC (rev 10160)
+++ trunk/freenet/src/freenet/client/async/SingleBlockInserter.java     
2006-08-17 14:13:24 UTC (rev 10161)
@@ -172,11 +172,7 @@
                                fail(new 
InserterException(InserterException.TOO_MANY_RETRIES_IN_BLOCKS, errors, 
getURI()));
                        return;
                }
-               try {
-                       getScheduler(encode()).register(this);
-               } catch (InserterException e1) {
-                       fail(e1, true);
-               }
+               getScheduler().register(this);
        }

        private void fail(InserterException e) {
@@ -222,14 +218,15 @@
                        parent.completedBlock(false);
                        finished = true;
                } else {
-                       getScheduler(encode()).register(this);
+                       getScheduler().register(this);
                }
        }

-       private ClientRequestScheduler getScheduler(ClientKeyBlock block) {
-               if(block instanceof ClientCHKBlock)
+       private ClientRequestScheduler getScheduler() {
+               String uriType = uri.getKeyType().toUpperCase();
+               if(uriType.equals("CHK"))
                        return parent.chkScheduler;
-               else if(block instanceof ClientSSKBlock)
+               else if(uriType.equals("SSK") || uriType.equals("KSK"))
                        return parent.sskScheduler;
                else throw new IllegalArgumentException();
        }