ChangeLogTag:Wed Feb 21 07:27:58 2001 Carlos O'Ryan <coryan@uci.edu>

3 files changed, 28 insertions, 21 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index e530a832927..7c5917c9d8a 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,15 +1,22 @@
+Wed Feb 21 07:27:58 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * orbsvcs/tests/EC_Custom_Marshal/ECCM_Consumer.dsp:
+        * orbsvcs/tests/EC_Custom_Marshal/ECCM_Supplier.dsp:
+          The binary name was broken in this fails, this should fix the
+          problems in the Win32 builds.
+
 Tue Feb 20 21:01:53 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-	* tao/Connection_Handler.h:
-	* tao/Connection_Handler.cpp: Added a new method mark_invalid (). 
-	
-	* tao/IIOP_Connection_Handler.cpp: Checked for any buffered
-	  messages in the socket before closing the socket during
-	  handle_close (). This fix should fix the errors in
-	  Timed_Buffered_Oneways test. 
-	
-	* tao/IIOP_Transport.cpp: Purged the handle during
-	  close_connection ().
+        * tao/Connection_Handler.h:
+        * tao/Connection_Handler.cpp: Added a new method mark_invalid ().
+
+        * tao/IIOP_Connection_Handler.cpp: Checked for any buffered
+          messages in the socket before closing the socket during
+          handle_close (). This fix should fix the errors in
+          Timed_Buffered_Oneways test.
+
+        * tao/IIOP_Transport.cpp: Purged the handle during
+          close_connection ().
 
         * tao/Strategies/UIOP_Connection_Handler.cpp:
         * tao/Strategies/UIOP_Transport.cpp:
@@ -24,7 +31,7 @@ Tue Feb 20 20:34:06 2001  Jeff Parsons <parsons@cs.wustl.edu>
         * tao/Sequence_T.i:
         * tao/Sequence_T.cpp:
 
-          Reverted the change in 
+          Reverted the change in
 
           Mon Feb 19 11:26:05 2001  Jeff Parsons <parsons@cs.wustl.edu>
 
@@ -85,12 +92,12 @@ Tue Feb 20 16:13:22 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 Tue Feb 20 12:02:30 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-	* tao/IIOP_Connection_Handler.cpp (handle_close): 
-	* tao/Strategies/UIOP_Connection_Handler.cpp:
-	* orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp: Fixed a
-	  leak from open handles on the server side when the clients
-	  exit.  Thanks to Andy Olson <andrew.olson@lmco.com>
-	  and Ossama for helping with this.
+        * tao/IIOP_Connection_Handler.cpp (handle_close):
+        * tao/Strategies/UIOP_Connection_Handler.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp: Fixed a
+          leak from open handles on the server side when the clients
+          exit.  Thanks to Andy Olson <andrew.olson@lmco.com>
+          and Ossama for helping with this.
 
 Tue Feb 20 10:25:37 2001  Jeff Parsons <parsons@cs.wustl.edu>
 
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECCM_Consumer.dsp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECCM_Consumer.dsp
index 02e4de9f800..9b9968b742a 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECCM_Consumer.dsp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECCM_Consumer.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNaming.lib TAO_RTEvent.lib TAO_RTSched.lib TAO_Svc_Utils.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"

+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNaming.lib TAO_RTEvent.lib TAO_RTSched.lib TAO_Svc_Utils.lib /nologo /subsystem:console /machine:I386 /out:"ECM_Consumer.exe" /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"

 

 !ELSEIF  "$(CFG)" == "ECCM_Consumer - Win32 Debug"

 

@@ -76,7 +76,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNamingd.lib TAO_RTEventd.lib TAO_RTSchedd.lib TAO_Svc_Utilsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"

+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNamingd.lib TAO_RTEventd.lib TAO_RTSchedd.lib TAO_Svc_Utilsd.lib /nologo /subsystem:console /debug /machine:I386 /out:"ECM_Consumer.exe" /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"

 

 !ENDIF 

 

diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECCM_Supplier.dsp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECCM_Supplier.dsp
index fb4ad6d6204..8de39935bcd 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECCM_Supplier.dsp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECCM_Supplier.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNaming.lib TAO_RTEvent.lib TAO_RTSched.lib TAO_Svc_Utils.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"

+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNaming.lib TAO_RTEvent.lib TAO_RTSched.lib TAO_Svc_Utils.lib /nologo /subsystem:console /machine:I386 /out:"ECM_Supplier.exe" /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"

 

 !ELSEIF  "$(CFG)" == "ECCM_Supplier - Win32 Debug"

 

@@ -76,7 +76,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNamingd.lib TAO_RTEventd.lib TAO_RTSchedd.lib TAO_Svc_Utilsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"

+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNamingd.lib TAO_RTEventd.lib TAO_RTSchedd.lib TAO_Svc_Utilsd.lib /nologo /subsystem:console /debug /machine:I386 /out:"ECM_Supplier.exe" /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"

 

 !ENDIF