ChangeLogTag:Sun Apr 28 21:43:17 2002 Balachandran Natarajan <bala@cs.wustl.edu>

7 files changed, 28 insertions, 7 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 7955cdd1d00..15a3653ca4f 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,16 @@
+Sun Apr 28 21:43:17 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+	* tao/Transport_Connector.h:
+	* tao/Transport_Connector.cpp: Changed the method
+	  create_connect_strategy () to return an int. This should help
+	  us to do some error checking.
+
+	* tao/IIOP_Connector.cpp:
+	* tao/Strategies/DIOP_Connector.cpp:
+	* tao/Strategies/UIOP_Connector.cpp: 
+	* orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp: Used the
+	  return value to check for errors.
+
 Sun Apr 28 18:01:47 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* tests/Makefile:
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
index abb9b8ade0a..11654e30dd4 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
@@ -66,7 +66,8 @@ TAO_UIPMC_Connector::open (TAO_ORB_Core *orb_core)
   this->orb_core (orb_core);
 
   // For the sake of uniformity do
-  this->create_connect_strategy ();
+  if (this->create_connect_strategy () == -1)
+    return -1;
 
   // @@ Michael: We do not use traditional connection management.
 
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp
index 4544fed724f..2b420db2fdf 100644
--- a/TAO/tao/IIOP_Connector.cpp
+++ b/TAO/tao/IIOP_Connector.cpp
@@ -71,7 +71,8 @@ TAO_IIOP_Connector::open (TAO_ORB_Core *orb_core)
   this->orb_core (orb_core);
 
   // Create our connect strategy
-  this->create_connect_strategy ();
+  if (this->create_connect_strategy () == -1)
+    return -1;
 
   if (this->init_tcp_properties () != 0)
     return -1;
diff --git a/TAO/tao/Strategies/DIOP_Connector.cpp b/TAO/tao/Strategies/DIOP_Connector.cpp
index 5de966b7991..44d6903125c 100644
--- a/TAO/tao/Strategies/DIOP_Connector.cpp
+++ b/TAO/tao/Strategies/DIOP_Connector.cpp
@@ -71,7 +71,8 @@ TAO_DIOP_Connector::open (TAO_ORB_Core *orb_core)
   this->orb_core (orb_core);
 
   // Create our connect strategy
-  this->create_connect_strategy ();
+  if (this->create_connect_strategy () == 0)
+    return -1;
 
   // @@ Michael: We do not use regular connection management.
 
diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp
index 9be6bdf0862..0122f69ae8a 100644
--- a/TAO/tao/Strategies/UIOP_Connector.cpp
+++ b/TAO/tao/Strategies/UIOP_Connector.cpp
@@ -69,7 +69,8 @@ TAO_UIOP_Connector::open (TAO_ORB_Core *orb_core)
   this->orb_core (orb_core);
 
   // Create our connect strategy
-  this->create_connect_strategy ();
+  if (this->create_connect_strategy () == -1)
+    return -1;
 
   if (this->init_uiop_properties () != 0)
     return -1;
diff --git a/TAO/tao/Transport_Connector.cpp b/TAO/tao/Transport_Connector.cpp
index e5602d32234..be68b8b9224 100644
--- a/TAO/tao/Transport_Connector.cpp
+++ b/TAO/tao/Transport_Connector.cpp
@@ -248,13 +248,17 @@ TAO_Connector::connect (TAO_GIOP_Invocation *invocation,
 }
 
 
-void
+int
 TAO_Connector::create_connect_strategy (void)
 {
-  // @@ todo:Not exception safe!
   if (this->active_connect_strategy_ == 0)
     {
       this->active_connect_strategy_ =
         this->orb_core_->client_factory ()->create_connect_strategy (this->orb_core_);
     }
+
+  if (this->active_connect_strategy_ == 0)
+    return -1;
+
+  return 0;
 }
diff --git a/TAO/tao/Transport_Connector.h b/TAO/tao/Transport_Connector.h
index db32309d2ef..6fdf04ef940 100644
--- a/TAO/tao/Transport_Connector.h
+++ b/TAO/tao/Transport_Connector.h
@@ -117,7 +117,7 @@ protected:
   void orb_core (TAO_ORB_Core *orb_core);
 
   /// Create a connect strategy
-  void create_connect_strategy (void);
+  int create_connect_strategy (void);
 
   /// Return the TAO_ORB_Core pointer
   TAO_ORB_Core *orb_core (void);