commit 2ca9c2028593782621c8876817d8772aa5f46ac7
author Carl Yeksigian <carl@apache.org> Wed Aug 14 19:37:54 2013 -0400
committer Carl Yeksigian <carl@apache.org> Wed Aug 14 19:38:42 2013 -0400
tree 75d9cbde1f9994b5b8b7cb0b637504d66787a39f
parent d051ca0b23eab53ede689ba319256e5f30feebf8

THRIFT-820 Remove readLength attribute from BinaryProtocol

Patch: Carl Yeksigian

lib/delphi/src/Thrift.Protocol.pas

diff --git a/lib/delphi/src/Thrift.Protocol.pas b/lib/delphi/src/Thrift.Protocol.pas
index b08458a..1f27203 100644
--- a/lib/delphi/src/Thrift.Protocol.pas
+++ b/lib/delphi/src/Thrift.Protocol.pas
@@ -370,13 +370,11 @@
   protected

     FStrictRead : Boolean;

     FStrictWrite : Boolean;

-    FReadLength : Integer;

-    FCheckReadLength : Boolean;

 

   private

     function ReadAll( var buf: TBytes; off: Integer; len: Integer ): Integer;

     function ReadStringBody( size: Integer): string;

-    procedure CheckReadLength( len: Integer );

+

   public

 

     type

@@ -434,7 +432,6 @@
     function ReadDouble:Double; override;

     function ReadBinary: TBytes; override;

 

-    procedure SetReadLength( readLength: Integer );

   end;

 

 

@@ -859,18 +856,6 @@
   Create( trans, False, True);

 end;

 

-procedure TBinaryProtocolImpl.CheckReadLength(len: Integer);

-begin

-  if FCheckReadLength then

-  begin

-    Dec( FReadLength, len);

-    if FReadLength < 0 then

-    begin

-      raise Exception.Create( 'Message length exceeded: ' + IntToStr( len ) );

-    end;

-  end;

-end;

-

 constructor TBinaryProtocolImpl.Create( const trans: ITransport; strictRead,

   strictWrite: Boolean);

 begin

@@ -882,7 +867,6 @@
 function TBinaryProtocolImpl.ReadAll( var buf: TBytes; off,

   len: Integer): Integer;

 begin

-  CheckReadLength( len );

   Result := FTrans.ReadAll( buf, off, len );

 end;

 

@@ -892,7 +876,6 @@
   buf : TBytes;

 begin

   size := ReadI32;

-  CheckReadLength( size );

   SetLength( buf, size );

   FTrans.ReadAll( buf, 0, size);

   Result := buf;

@@ -1063,7 +1046,6 @@
 var

   buf : TBytes;

 begin

-  CheckReadLength( size );

   SetLength( buf, size );

   FTrans.ReadAll( buf, 0, size );

   Result := TEncoding.UTF8.GetString( buf);

@@ -1080,12 +1062,6 @@
 

 end;

 

-procedure TBinaryProtocolImpl.SetReadLength(readLength: Integer);

-begin

-  FReadLength := readLength;

-  FCheckReadLength := True;

-end;

-

 procedure TBinaryProtocolImpl.WriteBinary( const b: TBytes);

 var iLen : Integer;

 begin