Wed Mar 17 11:58:10 UTC 2010 Vladimir Zykov <vladimir.zykov@prismtech.com>

        Committed the changes that I had to revert before x.7.7.

        * ace/Strategies_T.cpp:
          Changed the code so that close() is called in case of failure
          instead of destroy().

        * ace/Connector.cpp:
        * ace/Connector.h:
          Changed the fix for bug#3731. Now NBCH adds a reference in
          constructor and removes it in destructor if the SVC_HANDLER that
          it owns is reference counted. This is a cleaner solution than the
          one used before.

        * tests/NonBlocking_Conn_Test.h:
        * tests/Process_Strategy_Test.cpp:
        * tests/NonBlocking_Conn_Test.cpp:
          Extended NonBlocking_Conn_Test and changed Process_Strategy_Test
          because of the change in Strategies_T.cpp.

        * tests/MT_NonBlocking_Connect_Test.cpp:
        * tests/tests.mpc:
        * tests/run_test.lst:
          Added a new test. This can be a reproducer for the bug#3731 which
          currently doesn't have its own test.

1 files changed, 11 insertions, 3 deletions

diff --git a/ACE/tests/NonBlocking_Conn_Test.h b/ACE/tests/NonBlocking_Conn_Test.h
index 77746238226..dc52f3fe694 100644
--- a/ACE/tests/NonBlocking_Conn_Test.h
+++ b/ACE/tests/NonBlocking_Conn_Test.h
@@ -33,11 +33,18 @@ public:
 
   enum Connection_Status
     {
-      SUCCEEDED,
-      FAILED
+      Conn_SUCCEEDED,
+      Conn_FAILED
     };
 
-  Svc_Handler (void);
+  enum Completion_Status
+    {
+      Comp_YES,
+      Comp_NO,
+      Comp_IGNORE
+    };
+
+  Svc_Handler (bool is_ref_counted = false);
 
   void connection_status (Connection_Status &status,
                           int &completion_counter);
@@ -49,6 +56,7 @@ public:
 
   Connection_Status *status_;
   int *completion_counter_;
+  bool is_ref_counted_;
 };
 
 #endif /* NONBLOCKING_CONN_TEST_H */