diff options
| author | jai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-02-20 21:08:04 +0000 |
|---|---|---|
| committer | jai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-02-20 21:08:04 +0000 |
| commit | 936f3add008ed4489cd76e92f78befc0cc353eff (patch) | |
| tree | 948865093ef57ca52c0a2c062dd83e42334e7068 /TAO/tao/DiffServPolicy | |
| parent | 5dde48e3220a50dd46464e76cece59322be36ab1 (diff) | |
| download | ATCD-936f3add008ed4489cd76e92f78befc0cc353eff.tar.gz | |
ChangeLogTag: Tue Feb 20 20:59:38 UTC 2007 Jaiganesh B <jai.dre.vanderbilt.edu>
Diffstat (limited to 'TAO/tao/DiffServPolicy')
| -rw-r--r-- | TAO/tao/DiffServPolicy/DiffServPolicy.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy.cpp b/TAO/tao/DiffServPolicy/DiffServPolicy.cpp index afdd56aef12..2a155c88d83 100644 --- a/TAO/tao/DiffServPolicy/DiffServPolicy.cpp +++ b/TAO/tao/DiffServPolicy/DiffServPolicy.cpp @@ -14,8 +14,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL int TAO_DiffServPolicy_Initializer::init (void) { - // TAO_ORB_Core::set_network_priority_protocols_hooks ( - // "DS_Network_Priority_Protocols_Hooks"); + TAO_ORB_Core::set_network_priority_protocols_hooks ( + "DS_Network_Priority_Protocols_Hooks"); ACE_Service_Config::process_directive ( ace_svc_desc_TAO_DS_Network_Priority_Protocols_Hooks); diff --git a/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp b/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp index 2102c5a299b..721a08cbc9a 100644 --- a/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp +++ b/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp @@ -78,7 +78,10 @@ TAO_DiffServ_Network_Priority_Hook::set_dscp_codepoint ( if (npm == TAO::Portable_Server::Cached_Policies:: CLIENT_PROPAGATED_NETWORK_PRIORITY) { - dscp_codepoint = nph->get_dscp_codepoint (request_service_context); + if (nph != 0) + { + dscp_codepoint = nph->get_dscp_codepoint (request_service_context); + } } else if (npm == TAO::Portable_Server::Cached_Policies:: SERVER_DECLARED_NETWORK_PRIORITY) |