summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2000-12-05 20:57:54 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2000-12-05 20:57:54 +0000
commitd10acbe2bd82e6ba452b4ea459fefcbc3b5935eb (patch)
treeba782dc454d91e83a900524047bae699def7be7f
parentdab563efd72ce10d867bff54f301c950bc719f99 (diff)
downloadATCD-d10acbe2bd82e6ba452b4ea459fefcbc3b5935eb.tar.gz
ChangeLogTag:Tue Dec 5 12:57:33 2000 Ossama Othman <ossama@uci.edu>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a11
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/server.cpp6
-rw-r--r--TAO/tests/Portable_Interceptors/Dynamic/server.cpp6
-rw-r--r--TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp6
4 files changed, 20 insertions, 9 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 61ceccad026..4a3332ca5cd 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,14 @@
+Tue Dec 5 12:57:33 2000 Ossama Othman <ossama@uci.edu>
+
+ * tests/Portable_Interceptors/Benchmark/server.cpp (main):
+ * tests/Portable_Interceptors/Dynamic/server.cpp (main):
+ * tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp
+ (main):
+
+ Activate the POA before attempting to narrow an object
+ reference. This fixes a problem where a CORBA::TRANSIENT()
+ exception was being thrown.
+
Tue Dec 5 11:40:28 2000 Ossama Othman <ossama@uci.edu>
* docs/releasenotes/index.html:
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp
index e95e371bcbf..4c65fb7d6fa 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp
@@ -81,6 +81,9 @@ main (int argc, char *argv[])
root_poa->the_POAManager (ACE_TRY_ENV);
ACE_TRY_CHECK;
+ poa_manager->activate (ACE_TRY_ENV);
+ ACE_TRY_CHECK;
+
Secure_Vault_i server_impl (orb.in ());
PortableServer::ObjectId_var id =
@@ -117,9 +120,6 @@ main (int argc, char *argv[])
ACE_OS::fclose (output_file);
}
- poa_manager->activate (ACE_TRY_ENV);
- ACE_TRY_CHECK;
-
if (orb->run () == -1)
ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp
index 9c177ad81fe..9a781a28a81 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp
@@ -76,6 +76,9 @@ main (int argc, char *argv[])
root_poa->the_POAManager (ACE_TRY_ENV);
ACE_TRY_CHECK;
+ poa_manager->activate (ACE_TRY_ENV);
+ ACE_TRY_CHECK;
+
if (parse_args (argc, argv) != 0)
return 1;
@@ -115,9 +118,6 @@ main (int argc, char *argv[])
ACE_OS::fclose (output_file);
}
- poa_manager->activate (ACE_TRY_ENV);
- ACE_TRY_CHECK;
-
if (orb->run () == -1)
ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp
index 4d3f2caef44..d1b2386e68a 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp
@@ -74,6 +74,9 @@ main (int argc, char *argv[])
root_poa->the_POAManager (ACE_TRY_ENV);
ACE_TRY_CHECK;
+ poa_manager->activate (ACE_TRY_ENV);
+ ACE_TRY_CHECK;
+
if (parse_args (argc, argv) != 0)
return 1;
@@ -113,9 +116,6 @@ main (int argc, char *argv[])
ACE_OS::fclose (output_file);
}
- poa_manager->activate (ACE_TRY_ENV);
- ACE_TRY_CHECK;
-
if (orb->run () == -1)
ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));