* java/util/zip/ZipInputStream.java (fill): New method.

	(compressed_len): New instance variable.
	(getNextStream): Set it.
	(read): Reset inflater on EOF.  Only read via `super' if entry is
	deflated.
	(skip): Only skip via `super' if entry is deflated.
	* java/util/zip/Deflater.java (last_input_count): Removed.
	* java/util/zip/natDeflater.cc (deflate): Return 0 if input array
	is length 0.
	(needsInput): Don't use last_input_count.
	(setInput): Don't set last_input_count.
	* java/util/zip/natInflater.cc (getRemaining): Return correct
	result.
	(inflate): Return 0 if input array is length 0.
	(setInput): Don't set last_input_count.
	* java/util/zip/Inflater.java (last_input_count): Removed.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@27105 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 4 insertions, 2 deletions

diff --git a/libjava/java/util/zip/natDeflater.cc b/libjava/java/util/zip/natDeflater.cc
index 58d873a970a..566f918a77a 100644
--- a/libjava/java/util/zip/natDeflater.cc
+++ b/libjava/java/util/zip/natDeflater.cc
@@ -41,6 +41,9 @@ java::util::zip::Deflater::deflate (jbyteArray buf, jint off, jint len)
   if (off < 0 || len < 0 || off + len > buf->length)
     _Jv_Throw (new java::lang::ArrayIndexOutOfBoundsException);
 
+  if (len == 0)
+    return 0;
+
   s->next_out = (Bytef *) (elements (buf) + off);
   s->avail_out = len;
 
@@ -111,7 +114,7 @@ java::util::zip::Deflater::needsInput ()
 {
   JvSynchronize sync (this);
   z_streamp s = (z_streamp) zstream;
-  return s->avail_in - last_input_count == 0;
+  return s->avail_in == 0;
 }
 
 void
@@ -150,7 +153,6 @@ java::util::zip::Deflater::setInput (jbyteArray buf, jint off, jint len)
   if (off < 0 || len < 0 || off + len > buf->length)
     _Jv_Throw (new java::lang::ArrayIndexOutOfBoundsException);
 
-  last_input_count = len;
   s->next_in = (Bytef *) (elements (buf) + off);
   s->avail_in = len;
 }