    /// Pre-allocated memory to receive the data...
    ACE_Message_Block frame_;
  };
---- TAO.org/ACE_wrappers/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp	2006-03-21 18:13:44.000000000 +0100
-+++ TAO/ACE_wrappers/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp	2006-03-21 17:10:16.000000000 +0100
-@@ -111,6 +111,10 @@
-             }
-         }
-     }
-+  ACE_CATCH(CORBA::SystemException, ex)
-+      {
-+      ACE_RE_THROW; //ACS mod 2006-03
-+      }
-   ACE_CATCHANY
-     {
-       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Basic_StreamCtrl::stop");
-@@ -504,6 +508,10 @@
-           ACE_TRY_CHECK;
-         }
-     }
-+  ACE_CATCH(CORBA::SystemException, ex)
-+      {
-+      ACE_RE_THROW; //ACS mod 2006-03
-+      }
-   ACE_CATCHANY
-     {
-       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Basic_StreamCtrl::stop");
-@@ -3922,6 +3930,10 @@
-           ACE_TRY_CHECK;
-         }
-     }
-+  ACE_CATCH(CORBA::SystemException, ex)
-+      {
-+      ACE_RE_THROW; //ACS mod 2006-03
-+      }
-   ACE_CATCHANY
-     {
-       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_FlowConnection::stop");

   // Called by the <Strategy_Acceptor> when the handler is completely
   // connected.
   ACE_INET_Addr addr;
diff -Naur TAO.org/ACE_wrappers/TAO/orbsvcs/orbsvcs/AV/TCP.h TAO/ACE_wrappers/TAO/orbsvcs/orbsvcs/AV/TCP.h
--- TAO.org/ACE_wrappers/TAO/orbsvcs/orbsvcs/AV/TCP.h	1970-06-03 23:40:09.000000000 +0100
+++ TAO/ACE_wrappers/TAO/orbsvcs/orbsvcs/AV/TCP.h	2006-01-11 13:38:26.000000000 +0100
@@ -244,7 +244,7 @@
   /// end the stream.
   virtual int destroy (void);
 

--- TAO.org/ACE_wrappers/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp	2006-04-24 15:53:27.000000000 +0200
+++ TAO/ACE_wrappers/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp	2007-02-15 10:16:17.000000000 +0100
@@ -117,6 +117,14 @@
             }
         }
     }
+  ACE_CATCH(AVStreams::noSuchFlow, ex)
+      {
+      ACE_RE_THROW; //ACS mod 2006-02
+      }
+  ACE_CATCH(CORBA::SystemException, ex)
+      {
+      ACE_RE_THROW; //ACS mod 2006-03
+      }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Basic_StreamCtrl::stop");
@@ -167,6 +175,16 @@
             }
         }
     }
+  ACE_CATCH(AVStreams::noSuchFlow,ex)
+      {
+      ACE_PRINT_EXCEPTION(ex, "TAO_Basic_StreamCtrl::start");
+      ACE_RE_THROW;    //ACS mod 2007-02
+      }
+  ACE_CATCH(CORBA::SystemException,ex)
+      {
+      ACE_PRINT_EXCEPTION(ex, "TAO_Basic_StreamCtrl::start");
+      ACE_RE_THROW;    //ACS mod 2007-02
+      }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Basic_StreamCtrl::start");
@@ -510,6 +528,14 @@
           ACE_TRY_CHECK;
         }
     }
+ ACE_CATCH(AVStreams::noSuchFlow, ex)
+      {
+      ACE_RE_THROW; //ACS mod 2007-02
+      }
+  ACE_CATCH(CORBA::SystemException, ex)
+      {
+      ACE_RE_THROW; //ACS mod 2006-03
+      }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Basic_StreamCtrl::stop");
@@ -548,6 +574,16 @@
           ACE_TRY_CHECK;
         }
     }
+  ACE_CATCH(AVStreams::noSuchFlow,ex)
+      {
+      ACE_PRINT_EXCEPTION(ex, "TAO_StreamCtrl::start");
+      ACE_RE_THROW;  //ACS mod 2007-02
+      }
+  ACE_CATCH(CORBA::SystemException,ex)
+      {
+      ACE_PRINT_EXCEPTION(ex, "TAO_StreamCtrl::start");
+      ACE_RE_THROW;    //ACS mod 2007-02
+      }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamCtrl::start");
@@ -3932,6 +3968,10 @@
           ACE_TRY_CHECK;
         }
     }
+  ACE_CATCH(CORBA::SystemException, ex)
+      {
+      ACE_RE_THROW; //ACS mod 2006-03
+      }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_FlowConnection::stop");
@@ -3967,6 +4007,11 @@
           ACE_TRY_CHECK;
         }
     }
+  ACE_CATCH(CORBA::SystemException,ex)
+      {
+      ACE_PRINT_EXCEPTION(ex, "TAO_FlowConnection::start");   
+      ACE_RE_THROW;    //ACS mod 2007-02
+      }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_FlowConnection::start");
--- TAO.org/ACE_wrappers/TAO/orbsvcs/orbsvcs/AV/TCP.cpp	2006-05-16 16:06:38.000000000 +0200
+++ TAO/ACE_wrappers/TAO/orbsvcs/orbsvcs/AV/TCP.cpp	2006-12-14 17:01:31.000000000 +0100
@@ -656,6 +656,19 @@
                       -1);
 #endif /* TCP_NODELAY */
 
