ChangeLogTag: Tue Apr 8 13:20:02 2003 Pradeep Gore <pradeep@oomworks.com>

8 files changed, 97 insertions, 56 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index a9b7701627f..b2100030e77 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,25 @@
+Tue  Apr 8 13:20:02 2003 Pradeep Gore  <pradeep@oomworks.com>
+
+	* orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp:
+	  Method <destroy>: Removed extraneous call to shutdown ec_container_. 
+	
+	* orbsvcs/orbsvcs/Notify/Object.cpp:
+	  Eat exceptions in the <deactivate> method.
+	  Shutdown the proxy_poa_ and object_poa_ in the destructor.
+	
+	* orbsvcs/orbsvcs/Notify/Property_T.cpp:
+	  Method <set>: Check to see if the >>= operator returned success.
+	
+	* orbsvcs/orbsvcs/Notify/QoSProperties.cpp:
+	  Method <init>: Try to set the individual QoS properties only if some properties are available.
+	
+	* orbsvcs/tests/Notify/ThreadPool/consumer.conf:
+	  Corrected formatting of the conf. file.
+	
+	* orbsvcs/tests/Notify/lib/TAO_NotifyTests.dsp:
+	* orbsvcs/tests/Notify/Notify_Tests.dsw:	
+	  Corrected  to fix compile errors.
+	
 Tue Apr  8 16:38:00 2003  Dave Smith  <dts@prismtechnologies.com>
 
 	* tao/Any_T.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
index 210e7f17c9e..f00ff387b37 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
@@ -43,9 +43,6 @@ TAO_NS_EventChannelFactory::destroy (ACE_ENV_SINGLE_ARG_DECL)
   if (this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
     return;
 
-  this->ec_container_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
   TAO_NS_Properties* properties = TAO_NS_PROPERTIES::instance();
 
   delete this->ec_container_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp
index 5d5033e61dd..d228fe793e7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp
@@ -36,6 +36,9 @@ TAO_NS_Object::~TAO_NS_Object ()
 {
   if (TAO_debug_level > 2 )
     ACE_DEBUG ((LM_DEBUG,"object:%x  destroyed\n", this ));
+
+  this->shutdown_proxy_poa ();
+  this->shutdown_object_poa ();
 }
 
 void
@@ -66,7 +69,21 @@ TAO_NS_Object::activate (PortableServer::Servant servant ACE_ENV_ARG_DECL)
 void
 TAO_NS_Object::deactivate (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->poa_->deactivate (this->id_ ACE_ENV_ARG_PARAMETER);
+  ACE_TRY
+    {
+      this->poa_->deactivate (this->id_ ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      if (TAO_debug_level > 2)
+	{
+	  ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "(%P|%t)\n");
+	  ACE_DEBUG ((LM_DEBUG, "Could not deactivate object %d\n", this->id_));
+	}
+      // Do not propagate any exceptions
+    }
+  ACE_ENDTRY;
 }
 
 int
@@ -84,7 +101,6 @@ TAO_NS_Object::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
 
   this->shutdown_worker_task ();
-  this->shutdown_proxy_poa ();
 
   return 0;
 }
@@ -117,7 +133,7 @@ TAO_NS_Object::shutdown_proxy_poa (void)
         {
           this->proxy_poa_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           delete this->proxy_poa_;
         }
       ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp
index 817b42b1b47..37c2bb0afd3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp
@@ -100,20 +100,20 @@ TAO_NS_StructProperty_T<TYPE>::set (const TAO_NS_PropertySeq& property_seq)
 {
   CosNotification::PropertyValue value;
 
-  if (property_seq.find (this->name_, value) == -1)
+  if (property_seq.find (this->name_, value) == 0)
     {
-      this->valid_ = 0;
-      return -1;
+      TYPE* extract_type = 0;
+      
+      if ((value >>= extract_type)  && extract_type != 0) // make sure we get something valid.
+	{
+	  this->value_ = *extract_type; // copy
+	  this->valid_ = 1;
+	  return 0;
+	}
     }
-
-  TYPE* extract_type;
-  value >>= extract_type;
-
-  this->value_ = *extract_type; // copy
-
-  this->valid_ = 1;
-
-  return 0;
+  
+  this->valid_ = 0;
+  return -1;
 }
 
 #endif /* TAO_NS_PROPERTY_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp
index 8ca97503490..475c349150a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp
@@ -63,14 +63,17 @@ TAO_NS_QoSProperties::init (const CosNotification::PropertySeq& prop_seq, CosNot
       // Note call to rebind. This allows to call <init> to set updates.
     }
 
-  // Now, init the supported properties
-  this->priority_.set (*this);
-  this->timeout_.set (*this);
-  this->stop_time_supported_.set (*this);
-  this->maximum_batch_size_.set (*this);
-  this->pacing_interval_.set (*this);
-  this->thread_pool_.set (*this);
-  this->thread_pool_lane_.set (*this);
+  if (prop_seq.length () > 0)
+  {
+	// Now, init the supported properties
+	this->priority_.set (*this);
+	this->timeout_.set (*this);
+	this->stop_time_supported_.set (*this);
+	this->maximum_batch_size_.set (*this);
+	this->pacing_interval_.set (*this);
+	this->thread_pool_.set (*this);
+	this->thread_pool_lane_.set (*this);
+  }
 
   return err_index == -1 ? 0 : 1;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Notify_Tests.dsw b/TAO/orbsvcs/tests/Notify/Notify_Tests.dsw
index 180e61d62ec..ed71d210ca1 100644
--- a/TAO/orbsvcs/tests/Notify/Notify_Tests.dsw
+++ b/TAO/orbsvcs/tests/Notify/Notify_Tests.dsw
@@ -489,7 +489,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "TAO_RT_NotifyTests DLL"=..\..\..\..\..\..\ACE_wrappers\TAO\orbsvcs\tests\Notify\RT_lib\TAO_RT_NotifyTests.dsp - Package Owner=<4>

+Project: "TAO_RT_NotifyTests DLL"=.\RT_lib\TAO_RT_NotifyTests.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -497,11 +497,14 @@ Package=<5>
 

 Package=<4>

 {{{

+    Begin Project Dependency

+    Project_Dep_Name TAO_NotifyTests DLL

+    End Project Dependency

 }}}

 

 ###############################################################################

 

-Project: "TAO_RT_NotifyTests_Filter DLL"=..\..\..\..\..\..\ACE_wrappers\TAO\orbsvcs\tests\Notify\Test_Filter\TAO_RT_NotifyTests_Filter.dsp - Package Owner=<4>

+Project: "TAO_RT_NotifyTests_Filter DLL"=.\Test_Filter\TAO_RT_NotifyTests_Filter.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

diff --git a/TAO/orbsvcs/tests/Notify/ThreadPool/consumer.conf b/TAO/orbsvcs/tests/Notify/ThreadPool/consumer.conf
index fba1379fe1d..d9dd3ec07ca 100644
--- a/TAO/orbsvcs/tests/Notify/ThreadPool/consumer.conf
+++ b/TAO/orbsvcs/tests/Notify/ThreadPool/consumer.conf
@@ -22,8 +22,7 @@ static Command_Builder "ConsumerAdmin -Create ca1 ec1 -AND_OP"
 static Command_Builder "ConsumerAdmin -Set_QoS ca1 -ThreadPool -Threads 1 -Priority 5"
 
 ##--------- Consumer 1 , connected to CA 1 --------
-static Command_Builder "PeriodicConsumer -Create c1 ca1 -POA poa_1
--Set_QoS -ThreadPool -Threads 1 -Priority 5 -Proxy c1_proxy -MaxCount 15 -Check_Priority"
+static Command_Builder "PeriodicConsumer -Create c1 ca1 -POA poa_1 -Set_QoS -ThreadPool -Threads 1 -Priority 5 -Proxy c1_proxy -MaxCount 15 -Check_Priority"
 static Command_Builder "Filter -CreateFilter f_c1 ff"
 static Command_Builder "Filter -Add_Constraint f_c1 'PoolId = 5'"
 static Command_Builder "Filter -Add_Filter f_c1 c1_proxy"
diff --git a/TAO/orbsvcs/tests/Notify/lib/TAO_NotifyTests.dsp b/TAO/orbsvcs/tests/Notify/lib/TAO_NotifyTests.dsp
index d3b4c2ebba4..8278cc575a9 100644
--- a/TAO/orbsvcs/tests/Notify/lib/TAO_NotifyTests.dsp
+++ b/TAO/orbsvcs/tests/Notify/lib/TAO_NotifyTests.dsp
@@ -6,27 +6,27 @@
 

 CFG=TAO_NotifyTests DLL - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE run the tool that generated this project file and specify the

-!MESSAGE nmake output type.  You can then use the following command:

-!MESSAGE

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

 !MESSAGE NMAKE /f "TAO_NotifyTests.mak".

-!MESSAGE

+!MESSAGE 

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE

+!MESSAGE 

 !MESSAGE NMAKE /f "TAO_NotifyTests.mak" CFG="TAO_NotifyTests DLL - Win32 Debug"

-!MESSAGE

+!MESSAGE 

 !MESSAGE Possible choices for configuration are:

-!MESSAGE

+!MESSAGE 

 !MESSAGE "TAO_NotifyTests DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

 !MESSAGE "TAO_NotifyTests DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE

+!MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

+MTL=midl.exe

 RSC=rc.exe

 

 !IF  "$(CFG)" == "TAO_NotifyTests DLL - Win32 Release"

@@ -37,13 +37,15 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-# ADD CPP /nologo /W3 /GX /O2 /MD /Zi /Ob2 /GR /I "..\..\..\..\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\tao" /I "..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D TAO_NOTIFY_TEST_BUILD_DLL=1 /FD /c

+# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /Ob2 /I "..\..\..\..\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\tao" /I "..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D TAO_NOTIFY_TEST_BUILD_DLL=1 /FD /c

 # SUBTRACT CPP /YX

-# ADD RSC /l 0x409 /d NDEBUG=1 /i "..\..\..\..\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\tao" /i "..\..\..\..\.."

+# ADD BASE RSC /l 0x409

+# ADD RSC /l 0x409 /i "..\..\..\..\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\tao" /i "..\..\..\..\.." /d NDEBUG=1

 BSC32=bscmake.exe

-# ADD BSC32 /nologo /o".\TAO_NotifyTests.bsc"

+# ADD BSC32 /nologo

 LINK32=link.exe

-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO TAO_CosEvent.lib TAO_CosNotification.lib TAO_ETCL.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_IORTable.lib TAO_DynamicAny.lib TAO_PortableServer.lib TAO.lib ACE.lib /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\DynamicAny" /libpath:"..\..\..\..\tao\IORTable" /libpath:"..\..\..\..\orbsvcs\orbsvcs\ETCL" /libpath:"..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /nologo /version:1.3 /subsystem:windows /dll  /machine:I386 /out:"..\..\..\..\..\bin\TAO_NotifyTests.dll"

+# ADD BASE LINK32 /machine:IX86

+# ADD LINK32 advapi32.lib user32.lib TAO_CosEvent.lib TAO_CosNotification.lib TAO_ETCL.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_IORTable.lib TAO_DynamicAny.lib TAO_PortableServer.lib TAO.lib ACE.lib /nologo /version:1.3 /subsystem:windows /dll /machine:I386 /out:"..\..\..\..\..\bin\TAO_NotifyTests.dll" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\DynamicAny" /libpath:"..\..\..\..\tao\IORTable" /libpath:"..\..\..\..\orbsvcs\orbsvcs\ETCL" /libpath:"..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

 

 !ELSEIF  "$(CFG)" == "TAO_NotifyTests DLL - Win32 Debug"

 

@@ -53,15 +55,18 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /MDd /GR /Gy /I "..\..\..\..\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\tao" /I "..\..\..\..\.." /D _DEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D TAO_NOTIFY_TEST_BUILD_DLL=1 /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /Gy /I "..\..\..\..\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\tao" /I "..\..\..\..\.." /D _DEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D TAO_NOTIFY_TEST_BUILD_DLL=1 /FD /c

 # SUBTRACT CPP /Fr /YX

-# ADD RSC /l 0x409 /d _DEBUG=1 /i "..\..\..\..\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\tao" /i "..\..\..\..\.."

+# ADD BASE RSC /l 0x409

+# ADD RSC /l 0x409 /i "..\..\..\..\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\tao" /i "..\..\..\..\.." /d _DEBUG=1

 BSC32=bscmake.exe

-# ADD BSC32 /nologo /o".\TAO_NotifyTests.bsc"

+# ADD BSC32 /nologo

 LINK32=link.exe

-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO TAO_CosEventd.lib TAO_CosNotificationd.lib TAO_ETCLd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_IORTabled.lib TAO_DynamicAnyd.lib TAO_PortableServerd.lib TAOd.lib ACEd.lib /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\DynamicAny" /libpath:"..\..\..\..\tao\IORTable" /libpath:"..\..\..\..\orbsvcs\orbsvcs\ETCL" /libpath:"..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /nologo /version:1.3 /subsystem:windows /dll /debug /pdb:TAO_NotifyTestsd.pdb /machine:I386 /out:"..\..\..\..\..\bin\TAO_NotifyTestsd.dll"

+# ADD BASE LINK32 /machine:IX86

+# ADD LINK32 advapi32.lib user32.lib TAO_CosEventd.lib TAO_CosNotificationd.lib TAO_ETCLd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_IORTabled.lib TAO_DynamicAnyd.lib TAO_PortableServerd.lib TAOd.lib ACEd.lib /nologo /version:1.3 /subsystem:windows /dll /incremental:no /pdb:"TAO_NotifyTestsd.pdb" /debug /machine:I386 /out:"..\..\..\..\..\bin\TAO_NotifyTestsd.dll" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\DynamicAny" /libpath:"..\..\..\..\tao\IORTable" /libpath:"..\..\..\..\orbsvcs\orbsvcs\ETCL" /libpath:"..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

+# SUBTRACT LINK32 /pdb:none

 

-!ENDIF

+!ENDIF 

 

 # Begin Target

 

@@ -367,13 +372,12 @@ SOURCE=.\Activation_Manager.idl
 

 # PROP Ignore_Default_Tool 1

 # Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)

+OutDir=.\.

 InputPath=.\Activation_Manager.idl

 InputName=Activation_Manager

-InputDir=.

-OutDir=.

 

 BuildCmds= \

-	..\..\..\..\..\bin\tao_idl -o $(OutDir) -I..\..\..\.. -I$(TAO_ROOT)\orbsvcs -Ge 1 -Sc $(InputPath)

+	..\..\..\..\..\bin\tao_idl -o $(OutDir) -I..\..\..\.. -I..\..\orbsvcs -Ge 1 -Sc $(InputPath)

 

 "$(OutDir)\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -392,20 +396,18 @@ BuildCmds= \
 

 "$(OutDir)\$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

-

 # End Custom Build

 

 !ELSEIF  "$(CFG)" == "TAO_NotifyTests DLL - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

 # Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)

+OutDir=.\.

 InputPath=.\Activation_Manager.idl

 InputName=Activation_Manager

-InputDir=.

-OutDir=.

 

 BuildCmds= \

-	..\..\..\..\..\bin\tao_idl -o $(OutDir) -I..\..\..\.. -I$(TAO_ROOT)\orbsvcs -Ge 1 -Sc $(InputPath)

+	..\..\..\..\..\bin\tao_idl -o $(OutDir) -I..\..\..\.. -I..\..\orbsvcs -Ge 1 -Sc $(InputPath)

 

 "$(OutDir)\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -424,10 +426,9 @@ BuildCmds= \
 

 "$(OutDir)\$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

-

 # End Custom Build

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # End Group