Caldavsync Sources / file diff

     1.1 --- a/src/net/fortuna/ical4j/model/Iso8601.java	Tue Feb 10 19:25:00 2015 +0100
     1.2 +++ b/src/net/fortuna/ical4j/model/Iso8601.java	Tue Feb 10 19:38:00 2015 +0100
     1.3 @@ -112,21 +112,22 @@
     1.4      public String toString() {
     1.5          // if time is floating avoid daylight saving rules when generating
     1.6          // string representation of date..
     1.7 -        if (!(format.getTimeZone() instanceof TimeZone)) {
     1.8 +        final java.util.TimeZone timeZone = format.getTimeZone();
     1.9 +        if (!(timeZone instanceof TimeZone)) {
    1.10              if (gmtFormat == null) {
    1.11                  gmtFormat = (DateFormat) format.clone();
    1.12                  gmtFormat.setTimeZone(TimeZone.getTimeZone(TimeZones.GMT_ID));
    1.13              }
    1.14 -            if (format.getTimeZone().inDaylightTime(this)
    1.15 -                    && format.getTimeZone().inDaylightTime(new Date(getTime() - 1))) {
    1.16 -                
    1.17 +            if (timeZone.inDaylightTime(this)
    1.18 +                    && timeZone.inDaylightTime(new Date(getTime() - 1))) {
    1.19 +
    1.20                  return gmtFormat.format(new Date(getTime()
    1.21 -                        + format.getTimeZone().getRawOffset()
    1.22 -                        + format.getTimeZone().getDSTSavings()));
    1.23 +                        + timeZone.getRawOffset()
    1.24 +                        + timeZone.getDSTSavings()));
    1.25  //                return format.format(new Date(getTime() - format.getTimeZone().getDSTSavings()));
    1.26              }
    1.27  //            return gmtFormat.format(new Date(getTime() + format.getTimeZone().getOffset(getTime())));
    1.28 -            return gmtFormat.format(new Date(getTime() + format.getTimeZone().getRawOffset()));
    1.29 +            return gmtFormat.format(new Date(getTime() + timeZone.getRawOffset()));
    1.30          }
    1.31          return format.format(this);
    1.32      }