ZipEntry.java (setComment): Don't check length when argument is null.

       * java/util/zip/ZipEntry.java (setComment): Don't check length when
       argument is null.

From-SVN: r63227

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c27bd8b5a0b9c3e102af8f1766b9356e9c947a9d..da27b23f0b93f0b7219ab174a36ddb7eb6d1b010 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-21  Mark Wielaard  <mark@klomp.org>
+
+       * java/util/zip/ZipEntry.java (setComment): Don't check length when
+       argument is null.
+
 2003-02-21  Mark Wielaard  <mark@klomp.org>
 
        * java/util/zip/ZipEntry.java (ZipEntry(String)): When name is bigger

diff --git a/libjava/java/util/zip/ZipEntry.java b/libjava/java/util/zip/ZipEntry.java
index b70585049dcaa1d1ff0b06789e8886cb821d3ffd..5284d793f6c01635a0e50a5a639212eb30d0bb1e 100644 (file)
--- a/libjava/java/util/zip/ZipEntry.java
+++ b/libjava/java/util/zip/ZipEntry.java
@@ -369,7 +369,7 @@ public class ZipEntry implements ZipConstants, Cloneable
    */
   public void setComment(String comment)
   {
-    if (comment.length() > 0xffff)
+    if (comment != null && comment.length() > 0xffff)
       throw new IllegalArgumentException();
     this.comment = comment;
   }