diff options
-rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 10 | ||||
-rw-r--r-- | TAO/tao/RT_Policy_i.h | 32 | ||||
-rw-r--r-- | TAO/tao/Stub.cpp | 18 | ||||
-rw-r--r-- | TAO/tests/Exposed_Policies/client.cpp | 15 |
4 files changed, 28 insertions, 47 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index f21df8c068a..a557ec4cdeb 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,11 @@ +Sat Aug 19 21:03:48 2000 Marina Spivak <marina@cs.wustl.edu> + + * tao/RT_Policy_i.h + * tao/Stub.cpp + * tests/Exposed_Policies/client.cpp: + + Comments/cosmetic updates. + Sat Aug 19 19:00:00 2000 Kirthika Parameswaran <kirthika@cs.wustl.edu> * TAO_IDL/be/be_visitor_operation/interceptors_ch.cpp @@ -26,7 +34,7 @@ Sat Aug 19 16:40:00 2000 Kirthika Parameswaran <kirthika@cs.wustl.edu> * docs/Smart_Proxies.html: Updated the documentation to remind users to build TAO/tao with smart_proxies=1 for a smart proxies enabled build. - + Sat Aug 19 15:20:34 2000 Balachandran Natarajan <bala@cs.wustl.edu> * tao/GIOP_Message_Acceptors.cpp (process_client_locate): diff --git a/TAO/tao/RT_Policy_i.h b/TAO/tao/RT_Policy_i.h index 881b2b56104..968714da11b 100644 --- a/TAO/tao/RT_Policy_i.h +++ b/TAO/tao/RT_Policy_i.h @@ -115,10 +115,7 @@ private: // Attributes. }; -// @@ Angelo: the traditional separator in ACE+TAO is // **** -// furthermore, it is better if you *don't* mix many classes in the -// same file, consider splitting this stuff. -//////////////////////////////////////////////////////////////////////////// +//************************************************************************* class TAO_Export TAO_ThreadpoolPolicy : public RTCORBA::ThreadpoolPolicy, @@ -164,7 +161,7 @@ private: // Attribute. }; -////////////////////////////////////////////////////////////////////////////// +//************************************************************************* class TAO_Export TAO_PrivateConnectionPolicy : public RTCORBA::PrivateConnectionPolicy, @@ -202,7 +199,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; -//////////////////////////////////////////////////////////////////////////// +//************************************************************************* class TAO_Export TAO_PriorityBandedConnectionPolicy : public RTCORBA::PriorityBandedConnectionPolicy, @@ -270,7 +267,8 @@ private: RTCORBA::PriorityBands priority_bands_; // Attribute. }; -//////////////////////////////////////////////////////////////////////////// + +//************************************************************************* class TAO_Export TAO_ServerProtocolPolicy : public RTCORBA::ServerProtocolPolicy, @@ -317,7 +315,7 @@ private: // Attribute. }; -//////////////////////////////////////////////////////////////////////////// +//************************************************************************* class TAO_Export TAO_ClientProtocolPolicy : public RTCORBA::ClientProtocolPolicy, @@ -384,7 +382,7 @@ private: // Attribute. }; -//////////////////////////////////////////////////////////////////////////// +//************************************************************************* class TAO_Export TAO_TCP_Properties : public RTCORBA::TCPProtocolProperties, @@ -474,7 +472,7 @@ private: CORBA::Boolean no_delay_; }; -////////////////////////////////////////////////////////////////////// +//************************************************************************* class TAO_Export TAO_Unix_Domain_Properties : public RTCORBA::ProtocolProperties, @@ -525,7 +523,7 @@ private: CORBA::Long recv_buffer_size_; }; -////////////////////////////////////////////////////////////////////// +//************************************************************************* class TAO_Export TAO_SMEM_Properties : public RTCORBA::ProtocolProperties, @@ -587,7 +585,7 @@ private: ACE_CString mmap_lockname_; }; -///////////////////////////////////////////////////////////////////////// +//************************************************************************* class TAO_Export TAO_GIOP_Properties : public RTCORBA::GIOPProtocolProperties, @@ -607,15 +605,7 @@ protected: TAO_GIOP_Properties (void); }; -////////////////////////////////////////////////////////////////////////// - -// @@ Angelo: I suspect that this stuff should be moved into the -// pluggable protocol framework, to be precise: -// + Each TAO_Protocol_Factory class should be able to create a -// ProtocolProperties object. -// + The ORB should use the list of available protocols to create -// any requested protocol property. -// +//************************************************************************* class TAO_Export TAO_Protocol_Properties_Factory { diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp index 9f141dc9310..403237b3e42 100644 --- a/TAO/tao/Stub.cpp +++ b/TAO/tao/Stub.cpp @@ -718,16 +718,6 @@ TAO_Stub::get_policy (CORBA::PolicyType type, // Validity check. Make sure requested policy type is appropriate // for this scope. - // @@ Angelo: is this the right exception to raise? I would thing - // that maybe CORBA::InvalidPolicies or something like that is - // what the spec requires? - // In fact, I could not find anything in the spec about raising - // exceptions while querying policies, maybe you can always query - // these policies, even at the object level, but the query just - // results in a <nil> policy returned? - // In that case the exception should only be raised when *setting* - // the policy, and that raises another exception, as specified in - // the 4.3.8 section of the spec.... if (type == RTCORBA::THREADPOOL_POLICY_TYPE || type == RTCORBA::SERVER_PROTOCOL_POLICY_TYPE) ACE_THROW_RETURN (CORBA::NO_PERMISSION (), @@ -777,8 +767,6 @@ TAO_Stub::get_client_policy (CORBA::PolicyType type, #if (TAO_HAS_RT_CORBA == 1) - // @@ Angelo: please see my comments above... - // Validity check. Make sure requested policy type is appropriate // for this scope. if (type == RTCORBA::THREADPOOL_POLICY_TYPE @@ -848,11 +836,6 @@ TAO_Stub::set_policy_overrides (const CORBA::PolicyList & policies, CORBA::ULong slot = policy->policy_type (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - // @@ Angelo: I'm almost certain that you cannot raise this - // exception here, the only one allowed by the spec is - // CORBA::InvalidPolicies, please fix it. - // BTW, please add the throw specs while you are at it. - // if (slot == RTCORBA::THREADPOOL_POLICY_TYPE || slot == RTCORBA::SERVER_PROTOCOL_POLICY_TYPE || slot == RTCORBA::PRIORITY_MODEL_POLICY_TYPE) @@ -918,7 +901,6 @@ TAO_Stub::get_policy_overrides (const CORBA::PolicyTypeSeq &types, { CORBA::ULong type = types[i]; - // @@ Angelo: please check the comments above. if (type == RTCORBA::THREADPOOL_POLICY_TYPE || type == RTCORBA::SERVER_PROTOCOL_POLICY_TYPE || type == RTCORBA::PRIORITY_MODEL_POLICY_TYPE) diff --git a/TAO/tests/Exposed_Policies/client.cpp b/TAO/tests/Exposed_Policies/client.cpp index 5c347530378..5de236695c5 100644 --- a/TAO/tests/Exposed_Policies/client.cpp +++ b/TAO/tests/Exposed_Policies/client.cpp @@ -179,13 +179,14 @@ main (int argc, char *argv[]) // @@ Angelo: in general this is a good test, but it does not // check if: - // + The values obtained are the expected values, could you - // compare against well known values somehow? - // + Can you check that things that should fail indeed do? For - // example: what if the user queries or tries to set a policy - // that makes no sense, like Timeouts? Certain values should - // be returned and maybe exceptions raised (I don't know), we - // need to check for that too! + // + The values obtained are the expected values, + // could you compare against well known values somehow? + // + Can + // you check that things that should fail indeed do? For + // example: what if the user queries or tries to set a policy + // that makes no sense on the client, like ServerProtocolPolicy? + // Certain values should be returned and maybe exceptions raised + // (I don't know), we need to check for that too! } ACE_CATCHANY { |