ChangeLogTag: Fri Jun 17 09:50:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

3 files changed, 9 insertions, 1 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 714a86710fe..235776c0f65 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jun 17 09:50:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Param_Test/Param_Test.mpc:
+          Added explicit after so that we don't compile the same idl file
+          at the same time multiple times
+
 Fri Jun 17 09:24:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/ORB.{h,cpp}:
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index f22977d0b59..0910712b4cd 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -1159,7 +1159,7 @@ CORBA::ORB::resolve_initial_references (const char *name,
 
   // -----------------------------------------------------------------
 
-  if (!CORBA::is_nil (result.in ()))
+  if (CORBA::is_nil (result.in ()))
     {
       // Search the object reference table.  This search must occur before
       // the InitRef table search, since it may contain local objects.
diff --git a/TAO/tests/Param_Test/Param_Test.mpc b/TAO/tests/Param_Test/Param_Test.mpc
index 5eb08fb58b0..3acdda2a21b 100644
--- a/TAO/tests/Param_Test/Param_Test.mpc
+++ b/TAO/tests/Param_Test/Param_Test.mpc
@@ -13,6 +13,7 @@ project(*Server): taoserver, minimum_corba {
 project(*Client): taoserver, minimum_corba, dynamicinterface {
   exename  = client
   idlflags += -GA
+  after += Param_Test_Server
 
   Source_Files {
     any.cpp
@@ -62,6 +63,7 @@ project(*Client): taoserver, minimum_corba, dynamicinterface {
 project(*Anyop): taoserver, minimum_corba {
   exename = anyop
   idlflags += -GA
+  after += Param_Test_Client
 
   Source_Files {
     param_testC.cpp