summaryrefslogtreecommitdiff
path: root/TAO/tao/Strategies
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/Strategies')
-rw-r--r--TAO/tao/Strategies/DIOP_Acceptor.cpp18
-rw-r--r--TAO/tao/Strategies/DIOP_Profile.cpp9
-rw-r--r--TAO/tao/Strategies/DIOP_Transport.cpp1
-rw-r--r--TAO/tao/Strategies/SHMIOP_Acceptor.cpp10
-rw-r--r--TAO/tao/Strategies/SHMIOP_Profile.cpp8
-rw-r--r--TAO/tao/Strategies/SHMIOP_Transport.cpp1
-rw-r--r--TAO/tao/Strategies/UIOP_Acceptor.cpp11
-rw-r--r--TAO/tao/Strategies/UIOP_Profile.cpp8
-rw-r--r--TAO/tao/Strategies/UIOP_Transport.cpp1
9 files changed, 21 insertions, 46 deletions
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp
index 4052ad5ce34..feef167fcb2 100644
--- a/TAO/tao/Strategies/DIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/DIOP_Acceptor.cpp
@@ -10,6 +10,7 @@
#include "tao/ORB_Core.h"
#include "tao/debug.h"
#include "tao/Protocols_Hooks.h"
+#include "tao/Codeset_Manager.h"
#include "ace/Auto_Ptr.h"
@@ -111,12 +112,8 @@ TAO_DIOP_Acceptor::create_new_profile (const TAO_ObjectKey &object_key,
pfile->tagged_components ().set_orb_type (TAO_ORB_TYPE);
- CONV_FRAME::CodeSetComponentInfo code_set_info;
- code_set_info.ForCharData.native_code_set =
- TAO_DEFAULT_CHAR_CODESET_ID;
- code_set_info.ForWcharData.native_code_set =
- TAO_DEFAULT_WCHAR_CODESET_ID;
- pfile->tagged_components ().set_code_sets (code_set_info);
+ this->orb_core_->codeset_manager()->
+ set_codeset(pfile->tagged_components());
}
return 0;
@@ -168,13 +165,8 @@ TAO_DIOP_Acceptor::create_shared_profile (const TAO_ObjectKey &object_key,
&& (this->version_.major >= 1 && this->version_.minor >= 1))
{
iiop_profile->tagged_components ().set_orb_type (TAO_ORB_TYPE);
-
- CONV_FRAME::CodeSetComponentInfo code_set_info;
- code_set_info.ForCharData.native_code_set =
- TAO_DEFAULT_CHAR_CODESET_ID;
- code_set_info.ForWcharData.native_code_set =
- TAO_DEFAULT_WCHAR_CODESET_ID;
- iiop_profile->tagged_components ().set_code_sets (code_set_info);
+ this->orb_core_->codeset_manager()->
+ set_codeset(iiop_profile->tagged_components());
}
index = 1;
diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp
index 27c3457526f..c015bbb1512 100644
--- a/TAO/tao/Strategies/DIOP_Profile.cpp
+++ b/TAO/tao/Strategies/DIOP_Profile.cpp
@@ -431,10 +431,7 @@ TAO_DIOP_Profile::encode (TAO_OutputCDR &stream) const
this->orb_core ()->output_cdr_msgblock_allocator (),
this->orb_core ()->orb_params ()->cdr_memcpy_tradeoff (),
TAO_DEF_GIOP_MAJOR,
- TAO_DEF_GIOP_MINOR,
- this->orb_core ()->to_iso8859 (),
- this->orb_core ()->to_unicode ());
-
+ TAO_DEF_GIOP_MINOR);
// Create the profile body
this->create_profile_body (encap);
@@ -465,9 +462,7 @@ TAO_DIOP_Profile::create_tagged_profile (void)
this->orb_core ()->output_cdr_msgblock_allocator (),
this->orb_core ()->orb_params ()->cdr_memcpy_tradeoff (),
TAO_DEF_GIOP_MAJOR,
- TAO_DEF_GIOP_MINOR,
- this->orb_core ()->to_iso8859 (),
- this->orb_core ()->to_unicode ());
+ TAO_DEF_GIOP_MINOR);
// Create the profile body
this->create_profile_body (encap);
diff --git a/TAO/tao/Strategies/DIOP_Transport.cpp b/TAO/tao/Strategies/DIOP_Transport.cpp
index 82274b7cec7..ea03fd05281 100644
--- a/TAO/tao/Strategies/DIOP_Transport.cpp
+++ b/TAO/tao/Strategies/DIOP_Transport.cpp
@@ -268,6 +268,7 @@ TAO_DIOP_Transport::send_request (TAO_Stub *stub,
max_wait_time) == -1)
return -1;
+ this->first_request_sent();
return 0;
}
diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
index 2072e61a650..b8995dcf2d0 100644
--- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
@@ -10,6 +10,7 @@
#include "tao/ORB_Core.h"
#include "tao/Server_Strategy_Factory.h"
#include "tao/debug.h"
+#include "tao/Codeset_Manager.h"
#if !defined(__ACE_INLINE__)
#include "SHMIOP_Acceptor.i"
@@ -128,13 +129,8 @@ TAO_SHMIOP_Acceptor::create_new_profile (const TAO_ObjectKey &object_key,
return 0;
pfile->tagged_components ().set_orb_type (TAO_ORB_TYPE);
-
- CONV_FRAME::CodeSetComponentInfo code_set_info;
- code_set_info.ForCharData.native_code_set =
- TAO_DEFAULT_CHAR_CODESET_ID;
- code_set_info.ForWcharData.native_code_set =
- TAO_DEFAULT_WCHAR_CODESET_ID;
- pfile->tagged_components ().set_code_sets (code_set_info);
+ this->orb_core_->codeset_manager()->
+ set_codeset(pfile->tagged_components());
return 0;
}
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp
index dd0cca3adec..73953e5ec1b 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp
@@ -445,9 +445,7 @@ TAO_SHMIOP_Profile::encode (TAO_OutputCDR &stream) const
this->orb_core ()->output_cdr_msgblock_allocator (),
this->orb_core ()->orb_params ()->cdr_memcpy_tradeoff (),
TAO_DEF_GIOP_MAJOR,
- TAO_DEF_GIOP_MINOR,
- this->orb_core ()->to_iso8859 (),
- this->orb_core ()->to_unicode ());
+ TAO_DEF_GIOP_MINOR);
this->create_profile_body (encap);
@@ -475,9 +473,7 @@ TAO_SHMIOP_Profile::create_tagged_profile (void)
this->orb_core ()->output_cdr_msgblock_allocator (),
this->orb_core ()->orb_params ()->cdr_memcpy_tradeoff (),
TAO_DEF_GIOP_MAJOR,
- TAO_DEF_GIOP_MINOR,
- this->orb_core ()->to_iso8859 (),
- this->orb_core ()->to_unicode ());
+ TAO_DEF_GIOP_MINOR);
// Create the profile body
this->create_profile_body (encap);
diff --git a/TAO/tao/Strategies/SHMIOP_Transport.cpp b/TAO/tao/Strategies/SHMIOP_Transport.cpp
index 2e48ec4e8e7..4151467e50f 100644
--- a/TAO/tao/Strategies/SHMIOP_Transport.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Transport.cpp
@@ -243,6 +243,7 @@ TAO_SHMIOP_Transport::send_request (TAO_Stub *stub,
max_wait_time) == -1)
return -1;
+ this->first_request_sent();
return this->idle_after_send ();
}
diff --git a/TAO/tao/Strategies/UIOP_Acceptor.cpp b/TAO/tao/Strategies/UIOP_Acceptor.cpp
index 3cb769777e0..b86a92d8e55 100644
--- a/TAO/tao/Strategies/UIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/UIOP_Acceptor.cpp
@@ -26,6 +26,7 @@
#include "tao/Server_Strategy_Factory.h"
#include "tao/debug.h"
#include "tao/Protocols_Hooks.h"
+#include "tao/Codeset_Manager.h"
ACE_RCSID(Strategies, UIOP_Acceptor, "$Id$")
@@ -138,12 +139,8 @@ TAO_UIOP_Acceptor::create_new_profile (const TAO_ObjectKey &object_key,
return 0;
pfile->tagged_components ().set_orb_type (TAO_ORB_TYPE);
-
- CONV_FRAME::CodeSetComponentInfo code_set_info;
- code_set_info.ForCharData.native_code_set = TAO_DEFAULT_CHAR_CODESET_ID;
- code_set_info.ForWcharData.native_code_set = TAO_DEFAULT_WCHAR_CODESET_ID;
- pfile->tagged_components ().set_code_sets (code_set_info);
-
+ this->orb_core_->codeset_manager()->
+ set_codeset (pfile->tagged_components());
return 0;
}
@@ -564,7 +561,7 @@ TAO_UIOP_Acceptor::init_uiop_properties (void)
tph->call_server_protocols_hook (send_buffer_size,
recv_buffer_size,
no_delay,
- enable_network_priority,
+ enable_network_priority,
protocol_type);
if(hook_result == -1)
diff --git a/TAO/tao/Strategies/UIOP_Profile.cpp b/TAO/tao/Strategies/UIOP_Profile.cpp
index 21ebcdf9639..1ed25209681 100644
--- a/TAO/tao/Strategies/UIOP_Profile.cpp
+++ b/TAO/tao/Strategies/UIOP_Profile.cpp
@@ -386,9 +386,7 @@ TAO_UIOP_Profile::encode (TAO_OutputCDR &stream) const
this->orb_core ()->output_cdr_msgblock_allocator (),
this->orb_core ()->orb_params ()->cdr_memcpy_tradeoff (),
TAO_DEF_GIOP_MAJOR,
- TAO_DEF_GIOP_MINOR,
- this->orb_core ()->to_iso8859 (),
- this->orb_core ()->to_unicode ());
+ TAO_DEF_GIOP_MINOR);
// Create the profile body
this->create_profile_body (encap);
@@ -417,9 +415,7 @@ TAO_UIOP_Profile::create_tagged_profile (void)
this->orb_core ()->output_cdr_msgblock_allocator (),
this->orb_core ()->orb_params ()->cdr_memcpy_tradeoff (),
TAO_DEF_GIOP_MAJOR,
- TAO_DEF_GIOP_MINOR,
- this->orb_core ()->to_iso8859 (),
- this->orb_core ()->to_unicode ());
+ TAO_DEF_GIOP_MINOR);
// Create the profile body
this->create_profile_body (encap);
diff --git a/TAO/tao/Strategies/UIOP_Transport.cpp b/TAO/tao/Strategies/UIOP_Transport.cpp
index 14823585184..3270f94f012 100644
--- a/TAO/tao/Strategies/UIOP_Transport.cpp
+++ b/TAO/tao/Strategies/UIOP_Transport.cpp
@@ -171,6 +171,7 @@ TAO_UIOP_Transport::send_request (TAO_Stub *stub,
max_wait_time) == -1)
return -1;
+ this->first_request_sent();
return this->idle_after_send ();
}
View Lorry Controller Status