Changeset eea0990


Ignore:
Timestamp:
Jun 3, 2019 11:39:56 AM (10 months ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
fe6c7cd
Parents:
aa0bafb
Message:

Use hasWrapper() util method

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • apps/routerconsole/jsp/configservice.jsp

    raa0bafb reea0990  
    3030 <% } %>
    3131 </div>
    32  <% if (System.getProperty("wrapper.version") != null) { %>
     32 <% if (net.i2p.util.SystemVersion.hasWrapper()) { %>
    3333 <h3 class="ptitle" id="restartrouter"><%=intl._t("Restart the router")%></h3>
    3434 <p class="infohelp">
     
    7373 <h3 class="ptitle" id="servicedebug"><%=intl._t("Debugging")%>&nbsp;<a href="/jobs">[<%=intl._t("View the job queue")%>]</a></h3>
    7474 <p class="infohelp">
    75 <% if (System.getProperty("wrapper.version") != null) { %>
     75<% if (net.i2p.util.SystemVersion.hasWrapper()) { %>
    7676    <%=intl._t("At times, it may be helpful to debug I2P by getting a thread dump. To do so, please select the following option and review the thread dumped to <a href=\"logs.jsp#servicelogs\">wrapper.log</a>.")%>
    7777<% } else { // hack to make layout work for non-wrapper %>
     
    8282 <div class="formaction" id="dumpthreads">
    8383 <input type="submit" class="reload" name="action" value="<%=intl._t("Force GC")%>" >
    84 <% if (System.getProperty("wrapper.version") != null) { %>
     84<% if (net.i2p.util.SystemVersion.hasWrapper()) { %>
    8585 <input type="submit" class="download" name="action" value="<%=intl._t("Dump threads")%>" >
    8686<% } %>
  • core/java/src/net/i2p/I2PAppContext.java

    raa0bafb reea0990  
    3737import net.i2p.util.SimpleTimer;
    3838import net.i2p.util.SimpleTimer2;
     39import net.i2p.util.SystemVersion;
    3940import net.i2p.util.I2PProperties.I2PPropertyCallback;
    4041
     
    929930     */
    930931    public boolean hasWrapper() {
    931         return System.getProperty("wrapper.version") != null;
     932        return SystemVersion.hasWrapper();
    932933    }
    933934
  • router/java/src/net/i2p/router/transport/udp/UDPTransport.java

    raa0bafb reea0990  
    5252import net.i2p.util.SimpleTimer;
    5353import net.i2p.util.SimpleTimer2;
     54import net.i2p.util.SystemVersion;
    5455import net.i2p.util.VersionComparator;
    5556
     
    10711072                // For now, only do this at startup
    10721073                if (oldIP != null &&
    1073                     System.getProperty("wrapper.version") != null &&
     1074                    SystemVersion.hasWrapper() &&
    10741075                    _context.getBooleanProperty(PROP_LAPTOP_MODE) &&
    10751076                    now - lastChanged > 10*60*1000 &&
Note: See TracChangeset for help on using the changeset viewer.