Changeset 573692d


Ignore:
Timestamp:
Jan 29, 2013 1:48:00 PM (8 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
a0befe5, cc4b0360
Parents:
78dcfd8
Message:
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • apps/routerconsole/jsp/formhandler.jsi

    r78dcfd8 r573692d  
    2020    String nonceAttr1 = klass + ".nonce";
    2121    String nonceAttr2 = nonceAttr1 + "Prev";
    22     String nonce1 = (String) session.getAttribute(nonceAttr1);
    23     String nonce2 = (String) session.getAttribute(nonceAttr2);
    24     formhandler.storeNonces(nonce1, nonce2);
     22    String nonce1 = null;
     23    try {
     24        // Jetty doesn't seem to ISE here...
     25        nonce1 = (String) session.getAttribute(nonceAttr1);
     26        String nonce2 = (String) session.getAttribute(nonceAttr2);
     27        formhandler.storeNonces(nonce1, nonce2);
     28    } catch (IllegalStateException ise) {
     29        // nonce1 will be null, removed in setAttibute below
     30    }
    2531
    2632    // Put all the params in the map, some handlers use this instead of individual setters
     
    3844    // since it does the form validation.
    3945    String pageNonce = formhandler.getNewNonce();
    40     session.setAttribute(nonceAttr2, nonce1);
    41     session.setAttribute(nonceAttr1, pageNonce);
     46    try {
     47        // Jetty waits to ISE until here....
     48        session.setAttribute(nonceAttr2, nonce1);
     49        session.setAttribute(nonceAttr1, pageNonce);
     50    } catch (IllegalStateException ise) {}
    4251
    4352%>
  • history.txt

    r78dcfd8 r573692d  
     12013-01-29 zzz
     2 * Console: Catch IllegalStateException storing nonces (ticket #852)
     3 * Translations:
     4   - Use JVM language name if available
     5   - Correct Estonian language code from ee to et
     6
    172013-01-27 zzz
    28 * BuildHandler:
  • router/java/src/net/i2p/router/RouterVersion.java

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