* Eepsite: Fix jetty.xml configuration of ThreadPool

history.txt

@@ -1,5 +1,6 @@
 2013-04-17 zzz
  * Console: Better handling of missing font for graphing (ticket #915)
+ * Eepsite: Fix jetty.xml configuration of ThreadPool
  * i2ptunnel: Fix default form action (ticket #882)
  * SusiDNS: Set target=_top in all external links to break out of console iframe
  * Systray: Better detection of 64-bit Windows (tickets #756, #912)

installer/resources/eepsite/jetty.xml

@@ -67,19 +67,22 @@
       <!-- Optional Java 5 bounded threadpool with job queue 
            Requests above the max will be rejected and logged.
            High-traffic sites should increase maximumPoolSize.
-           TODO: would be nice to use the 5-arg constructor but
-                 how do you use an Enum as the TimeUnit argument?
-           Alternatively, make a custom class where we can
-           set the thread name, set daemon, etc.
-           See RouterConsoleRunner.
        -->
       <New class="org.eclipse.jetty.util.thread.ExecutorThreadPool">
-        <!-- corePoolSize (must be at least 3, increase if Jetty hangs) -->
-        <Arg type="int">4</Arg>
+        <!-- corePoolSize (should be at least 3) -->
+        <Arg type="int">3</Arg>
         <!-- maximumPoolSize -->
         <Arg type="int">20</Arg>
         <!-- keepAliveTime (milliseconds) -->
         <Arg type="long">60000</Arg>
+        <Arg>
+            <Call class="java.util.concurrent.TimeUnit" name="valueOf" >
+                <Arg>MILLISECONDS</Arg>
+            </Call>
+        </Arg>
+        <Arg>
+            <New class="java.util.concurrent.SynchronousQueue" />
+        </Arg>
       </New>
     </Set>
 

router/java/src/net/i2p/router/RouterVersion.java

@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 8;
+    public final static long BUILD = 9;
 
     /** for example "-test" */
     public final static String EXTRA = "";