Changeset 272 for PinConnection/UCommThread.pas

Timestamp:

Aug 30, 2011, 3:50:15 PM (13 years ago)

Author:

george

Message:

• Fixed: Do not send or receive data for comm classes if not in active state.
• Fixed: TCommProtocol now raise ENotActive exception on try to send data while in inactive state.
• Fixed: Reseting event after data received in TCommThread class.

File:

• PinConnection/UCommThread.pas (modified) (4 diffs)

PinConnection/UCommThread.pas

@@ -19 +19 @@
   public
     Parent: TCommThread;
-    Stream: TMemoryStream;
+    Stream: TStreamHelper;
     procedure Execute; override;
     constructor Create(CreateSuspended: Boolean;
@@ -53 +53 @@
 procedure TCommThread.ReceiveData(Sender: TCommPin; Stream:TStream);
 begin
-  Ext.Send(Stream);
+  if FActive then Ext.Send(Stream);
 end;
 
@@ -115 +115 @@
 
 procedure TCommThreadReceiveThread.Execute;
-var
-  StreamHelper: TStreamHelper;
 begin
   try
-    StreamHelper := TStreamHelper.Create(Stream);
     with Parent do
     repeat
-      if FDataAvailable.WaitFor(1) = wrSignaled then begin
+      if FDataAvailable.WaitFor(1) = wrSignaled then
       try
         FInputBufferLock.Acquire;
         Stream.Size := 0;
-        StreamHelper.WriteStream(FInputBuffer, FInputBuffer.Size);
+        Stream.WriteStream(FInputBuffer, FInputBuffer.Size);
         Pin.Send(Stream);
+      finally
+        FDataAvailable.ResetEvent;
         FInputBuffer.Clear;
-      finally
         FInputBufferLock.Release;
-      end;
       end; // else Yield;
     until Terminated;
   finally
-    StreamHelper.Free;
   end;
 end;
@@ -143 +139 @@
 begin
   inherited;
-  Stream := TMemoryStream.Create;
+  Stream := TStreamHelper.Create;
 end;