diff options
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | java/util/Calendar.java | 2 | ||||
-rw-r--r-- | java/util/zip/DeflaterEngine.java | 5 |
3 files changed, 16 insertions, 2 deletions
@@ -1,3 +1,14 @@ +2006-05-07 Andrew John Hughes <gnu_andrew@member.fsf.org> + + PR classpath/27435: + * java/util/zip/DeflaterEngine.java: + (deflateFast(boolean,boolean)): Empty buffer when full. + +2006-05-07 Sven de Marothy <sven@physto.se> + + Fixed PR27343 + * java/util/Calendar.java (setTimeZone): Force recalculation. + 2006-05-07 Sven de Marothy <sven@physto.se> Fixed PR27463 diff --git a/java/util/Calendar.java b/java/util/Calendar.java index f94bed40d..a324f5ada 100644 --- a/java/util/Calendar.java +++ b/java/util/Calendar.java @@ -1037,6 +1037,8 @@ public abstract class Calendar implements Serializable, Cloneable public void setTimeZone(TimeZone zone) { this.zone = zone; + computeTime(); + computeFields(); } /** diff --git a/java/util/zip/DeflaterEngine.java b/java/util/zip/DeflaterEngine.java index 3eea7c250..f79e47742 100644 --- a/java/util/zip/DeflaterEngine.java +++ b/java/util/zip/DeflaterEngine.java @@ -497,7 +497,7 @@ class DeflaterEngine implements DeflaterConstants throw new InternalError(); } } - huffman.tallyDist(strstart - matchStart, matchLen); + boolean full = huffman.tallyDist(strstart - matchStart, matchLen); lookahead -= matchLen; if (matchLen <= max_lazy && lookahead >= MIN_MATCH) @@ -516,7 +516,8 @@ class DeflaterEngine implements DeflaterConstants updateHash(); } matchLen = MIN_MATCH - 1; - continue; + if (!full) + continue; } else { |