Changeset aea20a5


Ignore:
Timestamp:
Mar 11, 2017 4:27:37 PM (3 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
ba825e6
Parents:
0703a29
Message:

Fix HashSessionScavenger?, class changed in Jetty 9
History for prop, -4

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java

    r0703a29 raea20a5  
    2020import java.util.SortedSet;
    2121import java.util.StringTokenizer;
    22 import java.util.Timer;
    2322import java.util.concurrent.LinkedBlockingQueue;
    2423
     
    7372import org.eclipse.jetty.util.thread.ExecutorThreadPool;
    7473import org.eclipse.jetty.util.thread.QueuedThreadPool;
     74import org.eclipse.jetty.util.thread.ScheduledExecutorScheduler;
    7575import org.eclipse.jetty.util.thread.ThreadPool;
    7676
     
    9999    private volatile ClientAppState _state = UNINITIALIZED;
    100100    private static Server _server;
    101     private static Timer _jettyTimer;
     101    private static ScheduledExecutorScheduler _jettyTimer;
    102102    private String _listenPort;
    103103    private String _listenHost;
     
    242242        synchronized(RouterConsoleRunner.class) {
    243243            if (_jettyTimer != null) {
    244                 _jettyTimer.cancel();
     244                try {
     245                    _jettyTimer.stop();
     246                } catch (Exception e) {}
    245247                _jettyTimer = null;
    246248            }
     
    955957        synchronized(RouterConsoleRunner.class) {
    956958            if (_jettyTimer == null) {
    957                 _jettyTimer = new Timer("Console HashSessionScavenger", true);
     959                _jettyTimer = new ScheduledExecutorScheduler("Console HashSessionScavenger", true);
     960                try {
     961                    _jettyTimer.start();
     962                } catch (Exception e) {
     963                    System.err.println("Warning: ScheduledExecutorScheduler start failed: " + e);
     964                }
    958965            }
    959966            context.getServletContext().setAttribute("org.eclipse.jetty.server.session.timer", _jettyTimer);
  • history.txt

    r0703a29 raea20a5  
     12017-03-11 zzz
     2Prop from i2p.i2p.zzz.jetty9:
     3 * Console: Fix RouterConsoleRunner for Jetty 9
     4 * Debian packages:
     5   - Remove libjetty8-java and ant-optional dependencies
     6   - Add libjetty9-java and libtomcat8-java dependencies
     7     Fixes stretch/sid package (ticket #1902)
     8   - Fix up build files for package builds
     9 * Eepsite: Update initial configuration files for Jetty 9
     10 * Jetty:
     11   - Update to Jetty 9.2.21.v20170120 and Tomcat 8.0.33 (tickets #1512, #1935)
     12     Fixes jsp compilation on Java 9 (ticket #1870)
     13     We now support servlet API 3.1, JSP API 2.3, and EL API 3.0.
     14     Breaks the following plugins: bwschedule, i2pbote, i2pcontrol, zzzot
     15 * Startup: Add migration code for eepsite Jetty 8 configuration files
     16
    1172017-03-09 zzz
    218 * i2psnark: Prevent RuntimeException caused by corrupt i2psnark.dht.dat file
  • router/java/src/net/i2p/router/RouterVersion.java

    r0703a29 raea20a5  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 3;
     21    public final static long BUILD = 4;
    2222
    2323    /** for example "-test" */
Note: See TracChangeset for help on using the changeset viewer.