svn commit: r1325712 - in /thrift/trunk/lib/cpp/src/thrift/transport: TZlibTransport.cpp TZlibTransport.h

[ro...@apache.org]

Author: roger
Date: Fri Apr 13 10:30:11 2012
New Revision: 1325712

URL: http://svn.apache.org/viewvc?rev=1325712&view=rev
Log:
THRIFT-1564 Minor fixes to TZlibTransport
Patch: Dave Watson

Modified:
    thrift/trunk/lib/cpp/src/thrift/transport/TZlibTransport.cpp
    thrift/trunk/lib/cpp/src/thrift/transport/TZlibTransport.h

Modified: thrift/trunk/lib/cpp/src/thrift/transport/TZlibTransport.cpp
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/src/thrift/transport/TZlibTransport.cpp?rev=1325712&r1=1325711&r2=1325712&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/src/thrift/transport/TZlibTransport.cpp (original)
+++ thrift/trunk/lib/cpp/src/thrift/transport/TZlibTransport.cpp Fri Apr 13 10:30:11 2012
@@ -110,9 +110,15 @@ TZlibTransport::~TZlibTransport() {
 }
 
 bool TZlibTransport::isOpen() {
-  return (readAvail() > 0) || transport_->isOpen();
+  return (readAvail() > 0) || (rstream_->avail_in > 0) || transport_->isOpen();
 }
 
+bool TZlibTransport::peek() {
+  return (readAvail() > 0) || (rstream_->avail_in > 0) || transport_->peek();
+}
+
+
+
 // READING STRATEGY
 //
 // We have two buffers for reading: one containing the compressed data (crbuf_)
@@ -253,7 +259,7 @@ void TZlibTransport::flush()  {
                               "flush() called after finish()");
   }
 
-  flushToTransport(Z_SYNC_FLUSH);
+  flushToTransport(Z_FULL_FLUSH);
 }
 
 void TZlibTransport::finish()  {

Modified: thrift/trunk/lib/cpp/src/thrift/transport/TZlibTransport.h
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/src/thrift/transport/TZlibTransport.h?rev=1325712&r1=1325711&r2=1325712&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/src/thrift/transport/TZlibTransport.h (original)
+++ thrift/trunk/lib/cpp/src/thrift/transport/TZlibTransport.h Fri Apr 13 10:30:11 2012
@@ -144,6 +144,7 @@ class TZlibTransport : public TVirtualTr
   ~TZlibTransport();
 
   bool isOpen();
+  bool peek();
 
   void open() {
     transport_->open();