Caldavsync Sources / file comparison
comparison: src/net/fortuna/ical4j/model/TimeZoneRegistryImpl.java
src/net/fortuna/ical4j/model/TimeZoneRegistryImpl.java
- changeset 19
- 87d37281ea41
- parent 5
- e0e108e77052
equal
deleted
inserted
replaced
| 2:2aeb3d46ba2f | 3:482bdac52b30 |
|---|---|
| 71 private static final Map DEFAULT_TIMEZONES = new ConcurrentHashMap(); | 71 private static final Map DEFAULT_TIMEZONES = new ConcurrentHashMap(); |
| 72 | 72 |
| 73 private static final Properties ALIASES = new Properties(); | 73 private static final Properties ALIASES = new Properties(); |
| 74 static { | 74 static { |
| 75 try { | 75 try { |
| 76 ALIASES.load(ResourceLoader.getResourceAsStream("tz.alias")); | 76 ALIASES.load(ResourceLoader.getResourceAsStream("net/fortuna/ical4j/model/tz.alias")); |
| 77 } | 77 } |
| 78 catch (IOException ioe) { | 78 catch (IOException ioe) { |
| 79 LogFactory.getLog(TimeZoneRegistryImpl.class).warn( | 79 LogFactory.getLog(TimeZoneRegistryImpl.class).warn( |
| 80 "Error loading timezone aliases: " + ioe.getMessage()); | 80 "Error loading timezone aliases: " + ioe.getMessage()); |
| 81 } | 81 } |
| 82 try { | 82 try { |
| 83 ALIASES.load(ResourceLoader.getResourceAsStream("/tz.alias")); | 83 ALIASES.load(ResourceLoader.getResourceAsStream("tz.alias")); |
| 84 } | 84 } |
| 85 catch (Exception e) { | 85 catch (Exception e) { |
| 86 LogFactory.getLog(TimeZoneRegistryImpl.class).debug( | 86 LogFactory.getLog(TimeZoneRegistryImpl.class).debug( |
| 87 "Error loading custom timezone aliases: " + e.getMessage()); | 87 "Error loading custom timezone aliases: " + e.getMessage()); |
| 88 } | 88 } |
