Changeset 6ee1620


Ignore:
Timestamp:
Dec 27, 2010 3:56:19 PM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
cc4158a, f225c1c
Parents:
fefcb6c
Message:

fix console jetty temp file names when in ssl-only mode

File:
1 edited

Legend:

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

    rfefcb6c r6ee1620  
    211211                            boundAddresses++;
    212212                        } catch (Exception e) {   // probably no exceptions at this point
    213                             System.err.println("Unable to bind routerconsole to " + host + " port " + _listenPort + " for SSL: " + e);
     213                            System.err.println("Unable to bind routerconsole to " + host + " port " + sslPort + " for SSL: " + e);
    214214                        }
    215215                    }
     
    225225            _server.setRootWebApp(ROUTERCONSOLE);
    226226            WebApplicationContext wac = _server.addWebApplication("/", _webAppsDir + ROUTERCONSOLE + ".war");
    227             File tmpdir = new SecureDirectory(workDir, ROUTERCONSOLE + "-" + _listenPort);
     227            File tmpdir = new SecureDirectory(workDir, ROUTERCONSOLE + "-" +
     228                                                       (_listenPort != null ? _listenPort : _sslListenPort));
    228229            tmpdir.mkdir();
    229230            wac.setTempDirectory(tmpdir);
     
    240241                        if (! "false".equals(enabled)) {
    241242                            String path = new File(dir, fileNames[i]).getCanonicalPath();
    242                             tmpdir = new SecureDirectory(workDir, appName + "-" + _listenPort);
     243                            tmpdir = new SecureDirectory(workDir, appName + "-" +
     244                                                                  (_listenPort != null ? _listenPort : _sslListenPort));
    243245                            WebAppStarter.addWebApp(I2PAppContext.getGlobalContext(), _server, appName, path, tmpdir);
    244246
Note: See TracChangeset for help on using the changeset viewer.