Changeset d8e297dd


Ignore:
Timestamp:
Jan 2, 2012 12:31:23 PM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
b391ed1, f0eb5663
Parents:
f956539
Message:
Files:
4 edited

Legend:

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

    rf956539 rd8e297dd  
    138138    /** see comments in ConfigClientsHandler */
    139139    static Server getConsoleServer() {
     140        PortMapper pm = I2PAppContext.getGlobalContext().portMapper();
     141        int p1 = pm.getPort(PortMapper.SVC_CONSOLE);
     142        int p2 = pm.getPort(PortMapper.SVC_HTTPS_CONSOLE);
    140143        Collection c = Server.getHttpServers();
    141144        for (int i = 0; i < c.size(); i++) {
     
    143146            HttpListener[] hl = s.getListeners();
    144147            for (int j = 0; j < hl.length; j++) {
    145                 if (hl[j].getPort() == I2PAppContext.getGlobalContext().portMapper().getPort(PortMapper.SVC_CONSOLE))
     148                int port = hl[j].getPort();
     149                if (port == p1 || port == p2)
    146150                    return s;
    147151            }
  • core/java/src/net/i2p/util/PortMapper.java

    rf956539 rd8e297dd  
    6060    public int getPort(String service) {
    6161        int port = getPort(service, -1);
    62         if(-1==port)
    63             throw new RuntimeException("No port registered for service "+service);
    6462        return port;
    6563    }
  • history.txt

    rf956539 rd8e297dd  
     12012-01-02 zzz
     2 * Fix webapp PortMapper lookup for SSL-only console
     3 * Wrapper 3.5.13 for arm v7
     4
    152011-12-31 zzz
    26 * Fix log NPE when saveConfig() fails at startup, thx kytv
  • router/java/src/net/i2p/router/RouterVersion.java

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