*** empty log message ***

4 files changed, 87 insertions, 325 deletions

diff --git a/ace/ACE_Library.mak b/ace/ACE_Library.mak
index 759fc4e4121..2d6e1358a54 100644
--- a/ace/ACE_Library.mak
+++ b/ace/ACE_Library.mak
@@ -4297,21 +4297,38 @@ DEP_CPP_THREA=\
 	{$(INCLUDE)}"\.\config-win32-common.h"\

 	{$(INCLUDE)}"\.\config-win32.h"\

 	{$(INCLUDE)}"\.\config.h"\

+	{$(INCLUDE)}"\.\Containers.cpp"\

+	{$(INCLUDE)}"\.\Containers.h"\

+	{$(INCLUDE)}"\.\Containers.i"\

 	{$(INCLUDE)}"\.\Dynamic.h"\

 	{$(INCLUDE)}"\.\Dynamic.i"\

 	{$(INCLUDE)}"\.\Event_Handler.h"\

 	{$(INCLUDE)}"\.\Event_Handler.i"\

+	{$(INCLUDE)}"\.\Free_List.cpp"\

+	{$(INCLUDE)}"\.\Free_List.h"\

+	{$(INCLUDE)}"\.\Free_List.i"\

 	{$(INCLUDE)}"\.\Log_Msg.h"\

 	{$(INCLUDE)}"\.\Log_Priority.h"\

 	{$(INCLUDE)}"\.\Log_Record.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

+	{$(INCLUDE)}"\.\Malloc.h"\

+	{$(INCLUDE)}"\.\Malloc.i"\

+	{$(INCLUDE)}"\.\Malloc_T.cpp"\

+	{$(INCLUDE)}"\.\Malloc_T.h"\

+	{$(INCLUDE)}"\.\Malloc_T.i"\

 	{$(INCLUDE)}"\.\Managed_Object.cpp"\

 	{$(INCLUDE)}"\.\Managed_Object.h"\

 	{$(INCLUDE)}"\.\Managed_Object.i"\

+	{$(INCLUDE)}"\.\Mem_Map.h"\

+	{$(INCLUDE)}"\.\Mem_Map.i"\

+	{$(INCLUDE)}"\.\Memory_Pool.h"\

+	{$(INCLUDE)}"\.\Memory_Pool.i"\

 	{$(INCLUDE)}"\.\Object_Manager.h"\

 	{$(INCLUDE)}"\.\Object_Manager.i"\

 	{$(INCLUDE)}"\.\OS.h"\

 	{$(INCLUDE)}"\.\OS.i"\

+	{$(INCLUDE)}"\.\Signal.h"\

+	{$(INCLUDE)}"\.\Signal.i"\

 	{$(INCLUDE)}"\.\SString.h"\

 	{$(INCLUDE)}"\.\SString.i"\

 	{$(INCLUDE)}"\.\stdcpp.h"\

@@ -5434,6 +5451,8 @@ DEP_CPP_STRAT=\
 	{$(INCLUDE)}"\.\Synch_T.i"\

 	{$(INCLUDE)}"\.\Thread.h"\

 	{$(INCLUDE)}"\.\Thread.i"\

+	{$(INCLUDE)}"\.\Thread_Manager.h"\

+	{$(INCLUDE)}"\.\Thread_Manager.i"\

 	{$(INCLUDE)}"\.\Timer_Queue.h"\

 	{$(INCLUDE)}"\.\Timer_Queue_T.cpp"\

 	{$(INCLUDE)}"\.\Timer_Queue_T.h"\

@@ -8118,6 +8137,8 @@ DEP_CPP_REACT=\
 	{$(INCLUDE)}"\.\Synch_T.i"\

 	{$(INCLUDE)}"\.\Thread.h"\

 	{$(INCLUDE)}"\.\Thread.i"\

+	{$(INCLUDE)}"\.\Thread_Manager.h"\

+	{$(INCLUDE)}"\.\Thread_Manager.i"\

 	{$(INCLUDE)}"\.\Timer_Queue.h"\

 	{$(INCLUDE)}"\.\Timer_Queue_T.cpp"\

 	{$(INCLUDE)}"\.\Timer_Queue_T.h"\

@@ -10149,9 +10170,6 @@ DEP_CPP_LSOCK_=\
 # Begin Source File

 

 SOURCE=.\LSOCK_Connector.cpp

-

-!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

-

 DEP_CPP_LSOCK_C=\

 	{$(INCLUDE)}"\.\ACE.h"\

 	{$(INCLUDE)}"\.\ACE.i"\

@@ -10202,167 +10220,26 @@ DEP_CPP_LSOCK_C=\
 	{$(INCLUDE)}"\.\ws2tcpip.h"\

 	

 

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+

 "$(INTDIR)\LSOCK_Connector.obj" : $(SOURCE) $(DEP_CPP_LSOCK_C) "$(INTDIR)"

 

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

 

-DEP_CPP_LSOCK_C=\

-	{$(INCLUDE)}"\.\ACE.h"\

-	{$(INCLUDE)}"\.\ACE.i"\

-	{$(INCLUDE)}"\.\Addr.h"\

-	{$(INCLUDE)}"\.\Addr.i"\

-	{$(INCLUDE)}"\.\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\.\Auto_Ptr.h"\

-	{$(INCLUDE)}"\.\Auto_Ptr.i"\

-	{$(INCLUDE)}"\.\config-win32-common.h"\

-	{$(INCLUDE)}"\.\config-win32.h"\

-	{$(INCLUDE)}"\.\config.h"\

-	{$(INCLUDE)}"\.\INET_Addr.h"\

-	{$(INCLUDE)}"\.\INET_Addr.i"\

-	{$(INCLUDE)}"\.\IPC_SAP.h"\

-	{$(INCLUDE)}"\.\IPC_SAP.i"\

-	{$(INCLUDE)}"\.\Log_Msg.h"\

-	{$(INCLUDE)}"\.\Log_Priority.h"\

-	{$(INCLUDE)}"\.\Log_Record.h"\

-	{$(INCLUDE)}"\.\Log_Record.i"\

-	{$(INCLUDE)}"\.\LSOCK.h"\

-	{$(INCLUDE)}"\.\LSOCK.i"\

-	{$(INCLUDE)}"\.\LSOCK_Connector.h"\

-	{$(INCLUDE)}"\.\LSOCK_Connector.i"\

-	{$(INCLUDE)}"\.\LSOCK_Stream.h"\

-	{$(INCLUDE)}"\.\LSOCK_Stream.i"\

-	{$(INCLUDE)}"\.\Managed_Object.cpp"\

-	{$(INCLUDE)}"\.\Managed_Object.h"\

-	{$(INCLUDE)}"\.\Managed_Object.i"\

-	{$(INCLUDE)}"\.\Object_Manager.h"\

-	{$(INCLUDE)}"\.\Object_Manager.i"\

-	{$(INCLUDE)}"\.\OS.h"\

-	{$(INCLUDE)}"\.\OS.i"\

-	{$(INCLUDE)}"\.\SOCK.h"\

-	{$(INCLUDE)}"\.\SOCK.i"\

-	{$(INCLUDE)}"\.\SOCK_Connector.h"\

-	{$(INCLUDE)}"\.\SOCK_Connector.i"\

-	{$(INCLUDE)}"\.\SOCK_IO.h"\

-	{$(INCLUDE)}"\.\SOCK_IO.i"\

-	{$(INCLUDE)}"\.\SOCK_Stream.h"\

-	{$(INCLUDE)}"\.\SOCK_Stream.i"\

-	{$(INCLUDE)}"\.\SString.h"\

-	{$(INCLUDE)}"\.\SString.i"\

-	{$(INCLUDE)}"\.\stdcpp.h"\

-	{$(INCLUDE)}"\.\Time_Value.h"\

-	{$(INCLUDE)}"\.\Trace.h"\

-	{$(INCLUDE)}"\.\UNIX_Addr.h"\

-	{$(INCLUDE)}"\.\UNIX_Addr.i"\

-	{$(INCLUDE)}"\.\ws2tcpip.h"\

-	

 

 "$(INTDIR)\LSOCK_Connector.obj" : $(SOURCE) $(DEP_CPP_LSOCK_C) "$(INTDIR)"

 

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

 

-DEP_CPP_LSOCK_C=\

-	{$(INCLUDE)}"\.\ACE.h"\

-	{$(INCLUDE)}"\.\ACE.i"\

-	{$(INCLUDE)}"\.\Addr.h"\

-	{$(INCLUDE)}"\.\Addr.i"\

-	{$(INCLUDE)}"\.\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\.\Auto_Ptr.h"\

-	{$(INCLUDE)}"\.\Auto_Ptr.i"\

-	{$(INCLUDE)}"\.\config-win32-common.h"\

-	{$(INCLUDE)}"\.\config-win32.h"\

-	{$(INCLUDE)}"\.\config.h"\

-	{$(INCLUDE)}"\.\INET_Addr.h"\

-	{$(INCLUDE)}"\.\INET_Addr.i"\

-	{$(INCLUDE)}"\.\IPC_SAP.h"\

-	{$(INCLUDE)}"\.\IPC_SAP.i"\

-	{$(INCLUDE)}"\.\Log_Msg.h"\

-	{$(INCLUDE)}"\.\Log_Priority.h"\

-	{$(INCLUDE)}"\.\Log_Record.h"\

-	{$(INCLUDE)}"\.\Log_Record.i"\

-	{$(INCLUDE)}"\.\LSOCK.h"\

-	{$(INCLUDE)}"\.\LSOCK.i"\

-	{$(INCLUDE)}"\.\LSOCK_Connector.h"\

-	{$(INCLUDE)}"\.\LSOCK_Connector.i"\

-	{$(INCLUDE)}"\.\LSOCK_Stream.h"\

-	{$(INCLUDE)}"\.\LSOCK_Stream.i"\

-	{$(INCLUDE)}"\.\Managed_Object.cpp"\

-	{$(INCLUDE)}"\.\Managed_Object.h"\

-	{$(INCLUDE)}"\.\Managed_Object.i"\

-	{$(INCLUDE)}"\.\Object_Manager.h"\

-	{$(INCLUDE)}"\.\Object_Manager.i"\

-	{$(INCLUDE)}"\.\OS.h"\

-	{$(INCLUDE)}"\.\OS.i"\

-	{$(INCLUDE)}"\.\SOCK.h"\

-	{$(INCLUDE)}"\.\SOCK.i"\

-	{$(INCLUDE)}"\.\SOCK_Connector.h"\

-	{$(INCLUDE)}"\.\SOCK_Connector.i"\

-	{$(INCLUDE)}"\.\SOCK_IO.h"\

-	{$(INCLUDE)}"\.\SOCK_IO.i"\

-	{$(INCLUDE)}"\.\SOCK_Stream.h"\

-	{$(INCLUDE)}"\.\SOCK_Stream.i"\

-	{$(INCLUDE)}"\.\SString.h"\

-	{$(INCLUDE)}"\.\SString.i"\

-	{$(INCLUDE)}"\.\stdcpp.h"\

-	{$(INCLUDE)}"\.\Time_Value.h"\

-	{$(INCLUDE)}"\.\Trace.h"\

-	{$(INCLUDE)}"\.\UNIX_Addr.h"\

-	{$(INCLUDE)}"\.\UNIX_Addr.i"\

-	{$(INCLUDE)}"\.\ws2tcpip.h"\

-	

 

 "$(INTDIR)\LSOCK_Connector.obj" : $(SOURCE) $(DEP_CPP_LSOCK_C) "$(INTDIR)"

 

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

 

-DEP_CPP_LSOCK_C=\

-	{$(INCLUDE)}"\.\ACE.h"\

-	{$(INCLUDE)}"\.\ACE.i"\

-	{$(INCLUDE)}"\.\Addr.h"\

-	{$(INCLUDE)}"\.\Addr.i"\

-	{$(INCLUDE)}"\.\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\.\Auto_Ptr.h"\

-	{$(INCLUDE)}"\.\Auto_Ptr.i"\

-	{$(INCLUDE)}"\.\config-win32-common.h"\

-	{$(INCLUDE)}"\.\config-win32.h"\

-	{$(INCLUDE)}"\.\config.h"\

-	{$(INCLUDE)}"\.\INET_Addr.h"\

-	{$(INCLUDE)}"\.\INET_Addr.i"\

-	{$(INCLUDE)}"\.\IPC_SAP.h"\

-	{$(INCLUDE)}"\.\IPC_SAP.i"\

-	{$(INCLUDE)}"\.\Log_Msg.h"\

-	{$(INCLUDE)}"\.\Log_Priority.h"\

-	{$(INCLUDE)}"\.\Log_Record.h"\

-	{$(INCLUDE)}"\.\Log_Record.i"\

-	{$(INCLUDE)}"\.\LSOCK_Connector.h"\

-	{$(INCLUDE)}"\.\LSOCK_Connector.i"\

-	{$(INCLUDE)}"\.\LSOCK_Stream.h"\

-	{$(INCLUDE)}"\.\Managed_Object.cpp"\

-	{$(INCLUDE)}"\.\Managed_Object.h"\

-	{$(INCLUDE)}"\.\Managed_Object.i"\

-	{$(INCLUDE)}"\.\Object_Manager.h"\

-	{$(INCLUDE)}"\.\Object_Manager.i"\

-	{$(INCLUDE)}"\.\OS.h"\

-	{$(INCLUDE)}"\.\OS.i"\

-	{$(INCLUDE)}"\.\SOCK.h"\

-	{$(INCLUDE)}"\.\SOCK.i"\

-	{$(INCLUDE)}"\.\SOCK_Connector.h"\

-	{$(INCLUDE)}"\.\SOCK_Connector.i"\

-	{$(INCLUDE)}"\.\SOCK_IO.h"\

-	{$(INCLUDE)}"\.\SOCK_IO.i"\

-	{$(INCLUDE)}"\.\SOCK_Stream.h"\

-	{$(INCLUDE)}"\.\SOCK_Stream.i"\

-	{$(INCLUDE)}"\.\SString.h"\

-	{$(INCLUDE)}"\.\SString.i"\

-	{$(INCLUDE)}"\.\stdcpp.h"\

-	{$(INCLUDE)}"\.\Time_Value.h"\

-	{$(INCLUDE)}"\.\Trace.h"\

-	{$(INCLUDE)}"\.\UNIX_Addr.h"\

-	{$(INCLUDE)}"\.\UNIX_Addr.i"\

-	{$(INCLUDE)}"\.\ws2tcpip.h"\

-	

 

 "$(INTDIR)\LSOCK_Connector.obj" : $(SOURCE) $(DEP_CPP_LSOCK_C) "$(INTDIR)"

 

@@ -10446,9 +10323,6 @@ DEP_CPP_LSOCK_CO=\
 # Begin Source File

 

 SOURCE=.\LSOCK_Acceptor.cpp

-

-!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

-

 DEP_CPP_LSOCK_A=\

 	{$(INCLUDE)}"\.\ACE.h"\

 	{$(INCLUDE)}"\.\ACE.i"\

@@ -10499,167 +10373,26 @@ DEP_CPP_LSOCK_A=\
 	{$(INCLUDE)}"\.\ws2tcpip.h"\

 	

 

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+

 "$(INTDIR)\LSOCK_Acceptor.obj" : $(SOURCE) $(DEP_CPP_LSOCK_A) "$(INTDIR)"

 

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

 

-DEP_CPP_LSOCK_A=\

-	{$(INCLUDE)}"\.\ACE.h"\

-	{$(INCLUDE)}"\.\ACE.i"\

-	{$(INCLUDE)}"\.\Addr.h"\

-	{$(INCLUDE)}"\.\Addr.i"\

-	{$(INCLUDE)}"\.\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\.\Auto_Ptr.h"\

-	{$(INCLUDE)}"\.\Auto_Ptr.i"\

-	{$(INCLUDE)}"\.\config-win32-common.h"\

-	{$(INCLUDE)}"\.\config-win32.h"\

-	{$(INCLUDE)}"\.\config.h"\

-	{$(INCLUDE)}"\.\INET_Addr.h"\

-	{$(INCLUDE)}"\.\INET_Addr.i"\

-	{$(INCLUDE)}"\.\IPC_SAP.h"\

-	{$(INCLUDE)}"\.\IPC_SAP.i"\

-	{$(INCLUDE)}"\.\Log_Msg.h"\

-	{$(INCLUDE)}"\.\Log_Priority.h"\

-	{$(INCLUDE)}"\.\Log_Record.h"\

-	{$(INCLUDE)}"\.\Log_Record.i"\

-	{$(INCLUDE)}"\.\LSOCK.h"\

-	{$(INCLUDE)}"\.\LSOCK.i"\

-	{$(INCLUDE)}"\.\LSOCK_Acceptor.h"\

-	{$(INCLUDE)}"\.\LSOCK_Acceptor.i"\

-	{$(INCLUDE)}"\.\LSOCK_Stream.h"\

-	{$(INCLUDE)}"\.\LSOCK_Stream.i"\

-	{$(INCLUDE)}"\.\Managed_Object.cpp"\

-	{$(INCLUDE)}"\.\Managed_Object.h"\

-	{$(INCLUDE)}"\.\Managed_Object.i"\

-	{$(INCLUDE)}"\.\Object_Manager.h"\

-	{$(INCLUDE)}"\.\Object_Manager.i"\

-	{$(INCLUDE)}"\.\OS.h"\

-	{$(INCLUDE)}"\.\OS.i"\

-	{$(INCLUDE)}"\.\SOCK.h"\

-	{$(INCLUDE)}"\.\SOCK.i"\

-	{$(INCLUDE)}"\.\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\.\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\.\SOCK_IO.h"\

-	{$(INCLUDE)}"\.\SOCK_IO.i"\

-	{$(INCLUDE)}"\.\SOCK_Stream.h"\

-	{$(INCLUDE)}"\.\SOCK_Stream.i"\

-	{$(INCLUDE)}"\.\SString.h"\

-	{$(INCLUDE)}"\.\SString.i"\

-	{$(INCLUDE)}"\.\stdcpp.h"\

-	{$(INCLUDE)}"\.\Time_Value.h"\

-	{$(INCLUDE)}"\.\Trace.h"\

-	{$(INCLUDE)}"\.\UNIX_Addr.h"\

-	{$(INCLUDE)}"\.\UNIX_Addr.i"\

-	{$(INCLUDE)}"\.\ws2tcpip.h"\

-	

 

 "$(INTDIR)\LSOCK_Acceptor.obj" : $(SOURCE) $(DEP_CPP_LSOCK_A) "$(INTDIR)"

 

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

 

-DEP_CPP_LSOCK_A=\

-	{$(INCLUDE)}"\.\ACE.h"\

-	{$(INCLUDE)}"\.\ACE.i"\

-	{$(INCLUDE)}"\.\Addr.h"\

-	{$(INCLUDE)}"\.\Addr.i"\

-	{$(INCLUDE)}"\.\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\.\Auto_Ptr.h"\

-	{$(INCLUDE)}"\.\Auto_Ptr.i"\

-	{$(INCLUDE)}"\.\config-win32-common.h"\

-	{$(INCLUDE)}"\.\config-win32.h"\

-	{$(INCLUDE)}"\.\config.h"\

-	{$(INCLUDE)}"\.\INET_Addr.h"\

-	{$(INCLUDE)}"\.\INET_Addr.i"\

-	{$(INCLUDE)}"\.\IPC_SAP.h"\

-	{$(INCLUDE)}"\.\IPC_SAP.i"\

-	{$(INCLUDE)}"\.\Log_Msg.h"\

-	{$(INCLUDE)}"\.\Log_Priority.h"\

-	{$(INCLUDE)}"\.\Log_Record.h"\

-	{$(INCLUDE)}"\.\Log_Record.i"\

-	{$(INCLUDE)}"\.\LSOCK.h"\

-	{$(INCLUDE)}"\.\LSOCK.i"\

-	{$(INCLUDE)}"\.\LSOCK_Acceptor.h"\

-	{$(INCLUDE)}"\.\LSOCK_Acceptor.i"\

-	{$(INCLUDE)}"\.\LSOCK_Stream.h"\

-	{$(INCLUDE)}"\.\LSOCK_Stream.i"\

-	{$(INCLUDE)}"\.\Managed_Object.cpp"\

-	{$(INCLUDE)}"\.\Managed_Object.h"\

-	{$(INCLUDE)}"\.\Managed_Object.i"\

-	{$(INCLUDE)}"\.\Object_Manager.h"\

-	{$(INCLUDE)}"\.\Object_Manager.i"\

-	{$(INCLUDE)}"\.\OS.h"\

-	{$(INCLUDE)}"\.\OS.i"\

-	{$(INCLUDE)}"\.\SOCK.h"\

-	{$(INCLUDE)}"\.\SOCK.i"\

-	{$(INCLUDE)}"\.\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\.\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\.\SOCK_IO.h"\

-	{$(INCLUDE)}"\.\SOCK_IO.i"\

-	{$(INCLUDE)}"\.\SOCK_Stream.h"\

-	{$(INCLUDE)}"\.\SOCK_Stream.i"\

-	{$(INCLUDE)}"\.\SString.h"\

-	{$(INCLUDE)}"\.\SString.i"\

-	{$(INCLUDE)}"\.\stdcpp.h"\

-	{$(INCLUDE)}"\.\Time_Value.h"\

-	{$(INCLUDE)}"\.\Trace.h"\

-	{$(INCLUDE)}"\.\UNIX_Addr.h"\

-	{$(INCLUDE)}"\.\UNIX_Addr.i"\

-	{$(INCLUDE)}"\.\ws2tcpip.h"\

-	

 

 "$(INTDIR)\LSOCK_Acceptor.obj" : $(SOURCE) $(DEP_CPP_LSOCK_A) "$(INTDIR)"

 

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

 

-DEP_CPP_LSOCK_A=\

-	{$(INCLUDE)}"\.\ACE.h"\

-	{$(INCLUDE)}"\.\ACE.i"\

-	{$(INCLUDE)}"\.\Addr.h"\

-	{$(INCLUDE)}"\.\Addr.i"\

-	{$(INCLUDE)}"\.\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\.\Auto_Ptr.h"\

-	{$(INCLUDE)}"\.\Auto_Ptr.i"\

-	{$(INCLUDE)}"\.\config-win32-common.h"\

-	{$(INCLUDE)}"\.\config-win32.h"\

-	{$(INCLUDE)}"\.\config.h"\

-	{$(INCLUDE)}"\.\INET_Addr.h"\

-	{$(INCLUDE)}"\.\INET_Addr.i"\

-	{$(INCLUDE)}"\.\IPC_SAP.h"\

-	{$(INCLUDE)}"\.\IPC_SAP.i"\

-	{$(INCLUDE)}"\.\Log_Msg.h"\

-	{$(INCLUDE)}"\.\Log_Priority.h"\

-	{$(INCLUDE)}"\.\Log_Record.h"\

-	{$(INCLUDE)}"\.\Log_Record.i"\

-	{$(INCLUDE)}"\.\LSOCK_Acceptor.h"\

-	{$(INCLUDE)}"\.\LSOCK_Acceptor.i"\

-	{$(INCLUDE)}"\.\LSOCK_Stream.h"\

-	{$(INCLUDE)}"\.\Managed_Object.cpp"\

-	{$(INCLUDE)}"\.\Managed_Object.h"\

-	{$(INCLUDE)}"\.\Managed_Object.i"\

-	{$(INCLUDE)}"\.\Object_Manager.h"\

-	{$(INCLUDE)}"\.\Object_Manager.i"\

-	{$(INCLUDE)}"\.\OS.h"\

-	{$(INCLUDE)}"\.\OS.i"\

-	{$(INCLUDE)}"\.\SOCK.h"\

-	{$(INCLUDE)}"\.\SOCK.i"\

-	{$(INCLUDE)}"\.\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\.\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\.\SOCK_IO.h"\

-	{$(INCLUDE)}"\.\SOCK_IO.i"\

-	{$(INCLUDE)}"\.\SOCK_Stream.h"\

-	{$(INCLUDE)}"\.\SOCK_Stream.i"\

-	{$(INCLUDE)}"\.\SString.h"\

-	{$(INCLUDE)}"\.\SString.i"\

-	{$(INCLUDE)}"\.\stdcpp.h"\

-	{$(INCLUDE)}"\.\Time_Value.h"\

-	{$(INCLUDE)}"\.\Trace.h"\

-	{$(INCLUDE)}"\.\UNIX_Addr.h"\

-	{$(INCLUDE)}"\.\UNIX_Addr.i"\

-	{$(INCLUDE)}"\.\ws2tcpip.h"\

-	

 

 "$(INTDIR)\LSOCK_Acceptor.obj" : $(SOURCE) $(DEP_CPP_LSOCK_A) "$(INTDIR)"

 

@@ -11228,6 +10961,7 @@ DEP_CPP_IOSTR=\
 	{$(INCLUDE)}"\.\Handle_Set.i"\

 	{$(INCLUDE)}"\.\INET_Addr.h"\

 	{$(INCLUDE)}"\.\INET_Addr.i"\

+	{$(INCLUDE)}"\.\IOStream.h"\

 	{$(INCLUDE)}"\.\IOStream_T.cpp"\

 	{$(INCLUDE)}"\.\IOStream_T.h"\

 	{$(INCLUDE)}"\.\IOStream_T.i"\

@@ -11247,7 +10981,6 @@ DEP_CPP_IOSTR=\
 	{$(INCLUDE)}"\.\stdcpp.h"\

 	{$(INCLUDE)}"\.\Trace.h"\

 	{$(INCLUDE)}"\.\ws2tcpip.h"\

-	{$(INCLUDE)}"\IOSTREAM.H"\

 	

 

 !IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

@@ -13335,6 +13068,8 @@ DEP_CPP_ACTIV=\
 	{$(INCLUDE)}"\.\Synch_T.i"\

 	{$(INCLUDE)}"\.\Thread.h"\

 	{$(INCLUDE)}"\.\Thread.i"\

+	{$(INCLUDE)}"\.\Thread_Manager.h"\

+	{$(INCLUDE)}"\.\Thread_Manager.i"\

 	{$(INCLUDE)}"\.\Timer_Queue.h"\

 	{$(INCLUDE)}"\.\Timer_Queue_T.cpp"\

 	{$(INCLUDE)}"\.\Timer_Queue_T.h"\

@@ -15517,21 +15252,38 @@ DEP_CPP_THREA=\
 	{$(INCLUDE)}"\.\config-win32-common.h"\

 	{$(INCLUDE)}"\.\config-win32.h"\

 	{$(INCLUDE)}"\.\config.h"\

+	{$(INCLUDE)}"\.\Containers.cpp"\

+	{$(INCLUDE)}"\.\Containers.h"\

+	{$(INCLUDE)}"\.\Containers.i"\

 	{$(INCLUDE)}"\.\Dynamic.h"\

 	{$(INCLUDE)}"\.\Dynamic.i"\

 	{$(INCLUDE)}"\.\Event_Handler.h"\

 	{$(INCLUDE)}"\.\Event_Handler.i"\

+	{$(INCLUDE)}"\.\Free_List.cpp"\

+	{$(INCLUDE)}"\.\Free_List.h"\

+	{$(INCLUDE)}"\.\Free_List.i"\

 	{$(INCLUDE)}"\.\Log_Msg.h"\

 	{$(INCLUDE)}"\.\Log_Priority.h"\

 	{$(INCLUDE)}"\.\Log_Record.h"\

 	{$(INCLUDE)}"\.\Log_Record.i"\

+	{$(INCLUDE)}"\.\Malloc.h"\

+	{$(INCLUDE)}"\.\Malloc.i"\

+	{$(INCLUDE)}"\.\Malloc_T.cpp"\

+	{$(INCLUDE)}"\.\Malloc_T.h"\

+	{$(INCLUDE)}"\.\Malloc_T.i"\

 	{$(INCLUDE)}"\.\Managed_Object.cpp"\

 	{$(INCLUDE)}"\.\Managed_Object.h"\

 	{$(INCLUDE)}"\.\Managed_Object.i"\

+	{$(INCLUDE)}"\.\Mem_Map.h"\

+	{$(INCLUDE)}"\.\Mem_Map.i"\

+	{$(INCLUDE)}"\.\Memory_Pool.h"\

+	{$(INCLUDE)}"\.\Memory_Pool.i"\

 	{$(INCLUDE)}"\.\Object_Manager.h"\

 	{$(INCLUDE)}"\.\Object_Manager.i"\

 	{$(INCLUDE)}"\.\OS.h"\

 	{$(INCLUDE)}"\.\OS.i"\

+	{$(INCLUDE)}"\.\Signal.h"\

+	{$(INCLUDE)}"\.\Signal.i"\

 	{$(INCLUDE)}"\.\SString.h"\

 	{$(INCLUDE)}"\.\SString.i"\

 	{$(INCLUDE)}"\.\stdcpp.h"\

@@ -16654,6 +16406,8 @@ DEP_CPP_STRAT=\
 	{$(INCLUDE)}"\.\Synch_T.i"\

 	{$(INCLUDE)}"\.\Thread.h"\

 	{$(INCLUDE)}"\.\Thread.i"\

+	{$(INCLUDE)}"\.\Thread_Manager.h"\

+	{$(INCLUDE)}"\.\Thread_Manager.i"\

 	{$(INCLUDE)}"\.\Timer_Queue.h"\

 	{$(INCLUDE)}"\.\Timer_Queue_T.cpp"\

 	{$(INCLUDE)}"\.\Timer_Queue_T.h"\

@@ -19338,6 +19092,8 @@ DEP_CPP_REACT=\
 	{$(INCLUDE)}"\.\Synch_T.i"\

 	{$(INCLUDE)}"\.\Thread.h"\

 	{$(INCLUDE)}"\.\Thread.i"\

+	{$(INCLUDE)}"\.\Thread_Manager.h"\

+	{$(INCLUDE)}"\.\Thread_Manager.i"\

 	{$(INCLUDE)}"\.\Timer_Queue.h"\

 	{$(INCLUDE)}"\.\Timer_Queue_T.cpp"\

 	{$(INCLUDE)}"\.\Timer_Queue_T.h"\

@@ -22160,6 +21916,7 @@ DEP_CPP_IOSTR=\
 	{$(INCLUDE)}"\.\Handle_Set.i"\

 	{$(INCLUDE)}"\.\INET_Addr.h"\

 	{$(INCLUDE)}"\.\INET_Addr.i"\

+	{$(INCLUDE)}"\.\IOStream.h"\

 	{$(INCLUDE)}"\.\IOStream_T.cpp"\

 	{$(INCLUDE)}"\.\IOStream_T.h"\

 	{$(INCLUDE)}"\.\IOStream_T.i"\

@@ -22179,7 +21936,6 @@ DEP_CPP_IOSTR=\
 	{$(INCLUDE)}"\.\stdcpp.h"\

 	{$(INCLUDE)}"\.\Trace.h"\

 	{$(INCLUDE)}"\.\ws2tcpip.h"\

-	{$(INCLUDE)}"\IOSTREAM.H"\

 	

 

 !IF  "$(CFG)" == "ACE static library - Win32 Release"

@@ -24267,6 +24023,8 @@ DEP_CPP_ACTIV=\
 	{$(INCLUDE)}"\.\Synch_T.i"\

 	{$(INCLUDE)}"\.\Thread.h"\

 	{$(INCLUDE)}"\.\Thread.i"\

+	{$(INCLUDE)}"\.\Thread_Manager.h"\

+	{$(INCLUDE)}"\.\Thread_Manager.i"\

 	{$(INCLUDE)}"\.\Timer_Queue.h"\

 	{$(INCLUDE)}"\.\Timer_Queue_T.cpp"\

 	{$(INCLUDE)}"\.\Timer_Queue_T.h"\

diff --git a/ace/ACE_Library.mdp b/ace/ACE_Library.mdp
index 5c35309a86e..c7b81ad872b 100644
--- a/ace/ACE_Library.mdp
+++ b/ace/ACE_Library.mdp
diff --git a/ace/Strategies_T.cpp b/ace/Strategies_T.cpp
index f5706472ff5..86d7899228b 100644
--- a/ace/Strategies_T.cpp
+++ b/ace/Strategies_T.cpp
@@ -6,6 +6,7 @@
 
 #define ACE_BUILD_DLL
 #include "ace/Strategies_T.h"
+#include "ace/Synch.h"
 #include "ace/Service_Types.h"
 #include "ace/Thread_Manager.h"
 #include "ace/WFMO_Reactor.h"
@@ -809,35 +810,35 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::connect_s
 
   // Try to find the addres in the cache.  Only if we don't find it do
   // we create a new <SVC_HANDLER> and connect it with the server.
+  
+  ACE_GUARD_RETURN (MUTEX, ace_mon, this->lock_, -1);
 
-  {
-    if (this->connection_cache_.find (search_addr, sh) == -1)
-      {
-	ACE_NEW_RETURN (sh, SVC_HANDLER, -1);
-
-	// Actively establish the connection.  This is a timed blocking
-	// connect.
-	if (ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_svc_handler
-	    (sh,
-	     remote_addr,
-	     timeout,
-	     local_addr,
-	     reuse_addr,
-	     flags,
-	     perms) == -1)
-	  return -1;
-	// Insert the new SVC_HANDLER instance into the cache.
-	else
-	  {
-	    ACE_Hash_Addr<ACE_PEER_CONNECTOR_ADDR, SVC_HANDLER> server_addr (remote_addr,
-									     sh);
-	    if (this->connection_cache_.bind (server_addr, sh) == -1)
-	      return -1;
-	  }
-      }
-
-    sh->in_use (1);
-  }
+  if (this->connection_cache_.find (search_addr, sh) == -1)
+    {
+      ACE_NEW_RETURN (sh, SVC_HANDLER, -1);
+      
+      // Actively establish the connection.  This is a timed blocking
+      // connect.
+      if (ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_svc_handler
+          (sh,
+           remote_addr,
+           timeout,
+           local_addr,
+           reuse_addr,
+           flags,
+           perms) == -1)
+        return -1;
+      // Insert the new SVC_HANDLER instance into the cache.
+      else
+        {
+          ACE_Hash_Addr<ACE_PEER_CONNECTOR_ADDR, SVC_HANDLER> server_addr (remote_addr,
+                                                                           sh);
+          if (this->connection_cache_.bind (server_addr, sh) == -1)
+            return -1;
+        }
+    }
+  
+  sh->in_use (1);
   return 0;
 }
 
diff --git a/ace/Strategies_T.h b/ace/Strategies_T.h
index bca45ec7903..e3a492de8d8 100644
--- a/ace/Strategies_T.h
+++ b/ace/Strategies_T.h
@@ -624,8 +624,11 @@ public:
   // controls re-use of the cache.}>
 
 private:
-  ACE_Hash_Map_Manager <ACE_Hash_Addr <ACE_PEER_CONNECTOR_ADDR,SVC_HANDLER>, SVC_HANDLER*, MUTEX> connection_cache_;
+  ACE_Hash_Map_Manager <ACE_Hash_Addr <ACE_PEER_CONNECTOR_ADDR,SVC_HANDLER>, SVC_HANDLER*, ACE_Null_Mutex> connection_cache_;  
   // Table that maintains the cache of connected <SVC_HANDLER>s.
+
+  MUTEX lock_;
+  // Mutual exclusion for this object.
 };
 
 template <class SVC_HANDLER>