Changeset 244

Show
Ignore:
Timestamp:
03/01/06 15:05:23
Author:
douglm
Message:

Better handling of timezone errors

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/webadmin/src/org/bedework/webadmin/timezones/PEUploadTimezonesAction.java

    r55 r244  
    7171 * <p>Forwards to:<ul> 
    7272 *      <li>"noAccess"     user not authorised.</li> 
    73  *      <li>"error"        some sort of error.</li> 
     73 *      <li>"error"        some sort of fatal error.</li> 
     74 *      <li>"failed"       for some reason.</li> 
    7475 *      <li>"success"      processed.</li> 
    7576 * </ul> 
    …… 
    99100    TimeZonesParser tzp = new TimeZonesParser(upFile.getInputStream(), debug); 
    100101 
    101     Collection tzis = tzp.getTimeZones(); 
     102    Collection tzis = null; 
     103    try { 
     104      tzis = tzp.getTimeZones(); 
     105    } catch (Throwable t) { 
     106      // XXX Could probably do better figuring out what the error is 
     107      form.getErr().emit("org.bedework.error.timezones.readerror"); 
     108      return "failed"; 
     109    } 
    102110 
    103111    CalSvcI svci = form.fetchSvci(); 

  • trunk/calendar3/webadmin/war/WEB-INF/struts-config.xml

    r234 r244  
    470470               scope="session" 
    471471               validate="false"> 
     472    <forward name="failed" path="/admin/showMain.rdo" redirect="true"/> 
    472473    </action> 
    473474