ChangeLogTag: Fri Aug 17 19:26:00 2001 Craig Rodrigues <crodrigu@bbn.com>

2 files changed, 59 insertions, 36 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 85d04a7be88..8a6a8c7832e 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,9 @@
+Fri Aug 17 19:26:00 2001  Craig Rodrigues <crodrigu@bbn.com>
+
+       * orbsvcs/orbsvcs/Property/CosPropertyService_i.h
+
+         Add default values for CORBA::Environment variables. 
+
 Fri Aug 17 13:01:36 2001  Ossama Othman  <ossama@uci.edu>
 
 	* orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h (TAO_SSLIOP_Endpoint):
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
index c8c98bb3e41..fcb5d0550f1 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
@@ -126,7 +126,8 @@ public:
   // Destructor.
 
   virtual CosPropertyService::PropertySet_ptr
-  create_propertyset (CORBA::Environment &env)
+  create_propertyset (CORBA::Environment &ACE_TRY_ENV =
+		                         TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns a  new TAO_PropertySet object. "The property set returned
   // will *not* have any initial properties."
@@ -134,7 +135,8 @@ public:
   virtual CosPropertyService::PropertySet_ptr
   create_constrained_propertyset (const CosPropertyService::PropertyTypes &allowed_property_types,
                                   const CosPropertyService::Properties &allowed_properties,
-                                  CORBA::Environment &env)
+                                  CORBA::Environment &ACE_TRY_ENV = 
+				                     TAO_default_environment())
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::ConstraintNotSupported));
     // Allows a client to create a new TAO_PropertySet with specific
@@ -142,7 +144,8 @@ public:
 
   virtual CosPropertyService::PropertySet_ptr
   create_initial_propertyset (const CosPropertyService::Properties &initial_properties,
-                              CORBA::Environment &env)
+                              CORBA::Environment &ACE_TRY_ENV =
+			                         TAO_default_environment() )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::MultipleExceptions));
   // Allows a client to create a new TAO_PropertySet with specific
@@ -179,14 +182,15 @@ public:
   // Destructor.
 
   virtual CosPropertyService::PropertySetDef_ptr
-  create_propertysetdef (CORBA::Environment &env)
+  create_propertysetdef (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment())
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns a new TAO_PropertySetDef object.
 
   virtual CosPropertyService::PropertySetDef_ptr
   create_constrained_propertysetdef (const CosPropertyService::PropertyTypes &allowed_property_types,
                                      const CosPropertyService::PropertyDefs &allowed_property_defs,
-                                     CORBA::Environment &env)
+                                     CORBA::Environment &ACE_TRY_ENV =
+				                         TAO_default_environment())
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::ConstraintNotSupported));
   // Allows a client to create a new TAO_PropertySetDef with specific
@@ -194,7 +198,8 @@ public:
 
   virtual CosPropertyService::PropertySetDef_ptr
   create_initial_propertysetdef (const CosPropertyService::PropertyDefs &initial_property_defs,
-                                 CORBA::Environment &env)
+                                 CORBA::Environment &ACE_TRY_ENV =
+				                    TAO_default_environment() )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::MultipleExceptions));
   // Allows a client to create a new TAO_PropertySetDef with specific
@@ -227,16 +232,19 @@ public:
 
   TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types,
                    const CosPropertyService::Properties allowed_properties,
-                   CORBA::Environment &_env);
+                   CORBA::Environment &ACE_TRY_ENV =
+		                      TAO_default_environment() );
   // Init values that the PropertySetFactory will want to specify.
 
   TAO_PropertySet (const CosPropertyService::Properties initial_properties,
-                   CORBA::Environment &_env);
+                   CORBA::Environment &ACE_TRY_ENV =
+		                      TAO_default_environment() );
   // PropertySetFactory needs this constructor.
 
   TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types,
                    const CORBA::ULong number_of_allowed_propertydefs,
-                   CORBA::Environment &_env);
+                   CORBA::Environment &ACE_TRY_ENV =
+		                       TAO_default_environment() );
   // PropertySetDef's construction needs this.
 
   virtual ~TAO_PropertySet (void);
@@ -244,7 +252,8 @@ public:
 
   virtual void define_property (const char *property_name,
                                 const CORBA::Any &property_value,
-                                CORBA::Environment &env)
+                                CORBA::Environment &ACE_TRY_ENV =
+				       TAO_default_environment() )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::InvalidPropertyName,
                      CosPropertyService::ConflictingProperty,
@@ -256,12 +265,14 @@ public:
   // property name, duplicate name, type code over writing etc.
 
   virtual void define_properties (const CosPropertyService::Properties &nproperties,
-                                  CORBA::Environment &env)
+                                  CORBA::Environment &ACE_TRY_ENV =
+				         TAO_default_environment() )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::MultipleExceptions));
   // Define a sequence of properties at a time.
 
-  virtual CORBA::ULong get_number_of_properties (CORBA::Environment &env)
+  virtual CORBA::ULong get_number_of_properties (CORBA::Environment &ACE_TRY_ENV =
+		                                 TAO_default_environment() )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the number of properties that are currently defined in the
   // PropertySet.
@@ -269,13 +280,15 @@ public:
   virtual void get_all_property_names (CORBA::ULong how_many,
                                        CosPropertyService::PropertyNames_out property_names,
                                        CosPropertyService::PropertyNamesIterator_out rest,
-                                       CORBA::Environment &env)
+                                       CORBA::Environment &ACE_TRY_ENV =
+				                TAO_default_environment() )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the names of all the properties that are currently defined in
   // the property set.
 
   virtual CORBA::Any *get_property_value (const char *property_name,
-                                          CORBA::Environment &env)
+                                          CORBA::Environment &ACE_TRY_ENV =
+					  TAO_default_environment() )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::PropertyNotFound,
                      CosPropertyService::InvalidPropertyName));
@@ -283,21 +296,24 @@ public:
 
   virtual CORBA::Boolean get_properties (const CosPropertyService::PropertyNames &property_names,
                                          CosPropertyService::Properties_out nproperties,
-                                         CORBA::Environment &env)
+                                         CORBA::Environment &ACE_TRY_ENV =
+					       TAO_default_environment() )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get all names and their property values.
 
   virtual void get_all_properties (CORBA::ULong how_many,
                                    CosPropertyService::Properties_out nproperties,
                                    CosPropertyService::PropertiesIterator_out rest,
-                                   CORBA::Environment &env)
+                                   CORBA::Environment &ACE_TRY_ENV =
+				            TAO_default_environment() )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns all of the property names currently defined in the
   // PropertySet. If the PropertySet contains more than how_many
   // property names, then the remaining property names are put into the PropertyNamesIterator.
 
   virtual void delete_property (const char *property_name,
-                                CORBA::Environment &env)
+                                CORBA::Environment &ACE_TRY_ENV =
+				     TAO_default_environment() )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::PropertyNotFound,
                      CosPropertyService::InvalidPropertyName,
@@ -305,17 +321,18 @@ public:
   // Delete a property given a name.
 
   virtual void delete_properties (const CosPropertyService::PropertyNames &property_names,
-                                  CORBA::Environment &env)
+                                  CORBA::Environment &ACE_TRY_ENV = 
+				  TAO_default_environment())
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::MultipleExceptions));
   // Delete all the these properties from this property set.
 
-  virtual CORBA::Boolean delete_all_properties (CORBA::Environment &env)
+  virtual CORBA::Boolean delete_all_properties (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment())
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Delete everything from this property set.
 
   virtual CORBA::Boolean is_property_defined (const char *property_name,
-                                              CORBA::Environment &env)
+                                              CORBA::Environment &ACE_TRY_ENV = TAO_default_environment())
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::InvalidPropertyName));
   // Tell whether this property is defined or no. Forget about the
@@ -393,7 +410,7 @@ public:
   // Destructor.
 
   virtual void get_allowed_property_types (CosPropertyService::PropertyTypes_out property_types,
-                                           CORBA::Environment &env)
+                                           CORBA::Environment &ACE_TRY_ENV = TAO_default_environment())
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Indicates which types of properties are supported by this
   // PropertySet. If the output sequence is empty, then there is no
@@ -402,7 +419,7 @@ public:
   // get_allowed_properties output sequence is not empty.
 
   virtual void get_allowed_properties (CosPropertyService::PropertyDefs_out property_defs,
-                                       CORBA::Environment &env)
+                                       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Indicates which properties are supported by this PropertySet. If
@@ -413,7 +430,7 @@ public:
   virtual void define_property_with_mode (const char *property_name,
                                           const CORBA::Any &property_value,
                                           CosPropertyService::PropertyModeType property_mode,
-                                          CORBA::Environment &env)
+                                          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment())
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::InvalidPropertyName,
                      CosPropertyService::ConflictingProperty,
@@ -430,14 +447,14 @@ public:
   // exception is thrown.
 
   virtual void define_properties_with_modes (const CosPropertyService::PropertyDefs &property_defs,
-                                             CORBA::Environment &env)
+                                             CORBA::Environment &ACE_TRY_ENV = TAO_default_environment())
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::MultipleExceptions));
   // This operation will modify or add each of the properties in the
   // Properties parameter to the PropertySet.
 
   virtual CosPropertyService::PropertyModeType get_property_mode (const char *property_name,
-                                                                  CORBA::Environment &env)
+                                                                  CORBA::Environment &ACE_TRY_ENV = TAO_default_environment())
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::PropertyNotFound,
                      CosPropertyService::InvalidPropertyName));
@@ -446,7 +463,7 @@ public:
 
   virtual CORBA::Boolean get_property_modes (const CosPropertyService::PropertyNames &property_names,
                                              CosPropertyService::PropertyModes_out property_modes,
-                                             CORBA::Environment &env)
+                                             CORBA::Environment &ACE_TRY_ENV = TAO_default_environment())
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Batch operation for getting the property. Invoke
   // get_property_mode for each name.  Return value False indicates
@@ -458,7 +475,7 @@ public:
 
   virtual void set_property_mode (const char *property_name,
                                   CosPropertyService::PropertyModeType property_mode,
-                                  CORBA::Environment &env)
+                                  CORBA::Environment &ACE_TRY_ENV = TAO_default_environment())
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::InvalidPropertyName,
                      CosPropertyService::PropertyNotFound,
@@ -475,7 +492,7 @@ public:
   // raised.
 
   virtual void set_property_modes (const CosPropertyService::PropertyModes &property_modes,
-                                   CORBA::Environment &env)
+                                   CORBA::Environment &ACE_TRY_ENV = TAO_default_environment())
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::MultipleExceptions));
   // Batch operation for setting the property. Raises
@@ -505,13 +522,13 @@ public:
   virtual ~TAO_PropertyNamesIterator (void);
   // Destructor.
 
-  virtual void reset (CORBA::Environment &env)
+  virtual void reset (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment())
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The reset operation resets the position in an iterator to the
   // first property name, if one exists.
 
   virtual CORBA::Boolean next_one (CORBA::String_out property_name,
-                                   CORBA::Environment &env)
+                                   CORBA::Environment &ACE_TRY_ENV = TAO_default_environment())
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The next_one operation returns true if an item exists at the
   // current position in the iterator with an output parameter of a
@@ -520,7 +537,7 @@ public:
 
   virtual CORBA::Boolean next_n (CORBA::ULong how_many,
                                  CosPropertyService::PropertyNames_out property_names,
-                                 CORBA::Environment &env)
+                                 CORBA::Environment &ACE_TRY_ENV = TAO_default_environment())
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The next_n operation returns true if an item exists at the
   // current position in the iterator and the how_many parameter was
@@ -528,7 +545,7 @@ public:
   // with at most the how_many number of names. A return of false
   // signifies no more items in the iterator.
 
-  virtual void destroy (CORBA::Environment &env)
+  virtual void destroy (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment())
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Destroys the iterator.
 private:
@@ -568,12 +585,12 @@ public:
   virtual ~TAO_PropertiesIterator (void);
   // Destructor.
 
-  virtual void reset (CORBA::Environment &env)
+  virtual void reset (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment())
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Resets the position in an iterator to the first property, if one exists.
 
   virtual CORBA::Boolean next_one (CosPropertyService::Property_out aproperty,
-                                   CORBA::Environment &env)
+                                   CORBA::Environment &ACE_TRY_ENV = TAO_default_environment())
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The next_one operation returns true if an item exists at the
   // current position in the iterator with an output parameter of a
@@ -582,7 +599,7 @@ public:
 
   virtual CORBA::Boolean next_n (CORBA::ULong how_many,
                                  CosPropertyService::Properties_out nproperties,
-                                 CORBA::Environment &env)
+                                 CORBA::Environment &ACE_TRY_ENV = TAO_default_environment())
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The next_n operation returns true if an item exists at the
   // current position in the iterator and the how_many parameter was
@@ -590,7 +607,7 @@ public:
   // at most the how_many number of properties. A return of false
   // signifies no more items in the iterator.
 
-  virtual void destroy (CORBA::Environment &env)
+  virtual void destroy (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment())
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Destroys the iterator.