summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a22
-rw-r--r--TAO/examples/PluggableUDP/DIOP/DIOP_Profile.cpp4
-rw-r--r--TAO/tao/Any.cpp6
-rw-r--r--TAO/tao/Asynch_Reply_Dispatcher.cpp2
-rw-r--r--TAO/tao/CDR.cpp18
-rw-r--r--TAO/tao/CDR.h33
-rw-r--r--TAO/tao/CDR.i30
-rw-r--r--TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp2
-rw-r--r--TAO/tao/GIOP_Message_Base.cpp19
-rw-r--r--TAO/tao/GIOP_Message_Lite.cpp8
-rw-r--r--TAO/tao/IIOP_Profile.cpp4
-rw-r--r--TAO/tao/Invocation.cpp12
-rw-r--r--TAO/tao/ORB.cpp5
-rw-r--r--TAO/tao/Pluggable_Messaging_Utils.cpp2
-rw-r--r--TAO/tao/Strategies/SHMIOP_Profile.cpp4
-rw-r--r--TAO/tao/Strategies/UIOP_Profile.cpp4
-rw-r--r--TAO/tao/Synch_Reply_Dispatcher.cpp2
-rw-r--r--TAO/tao/TAO_Server_Request.cpp2
18 files changed, 162 insertions, 17 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 381cce3343e..a2e19d30cb9 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,25 @@
+Fri Jun 15 20:49:10 2001 Sharath R. Cholleti <sharath@cs.wustl.edu>
+
+ * tao/Any.cpp
+ * tao/Asynch_Reply_Dispatcher.cpp
+ * tao/CDR.cpp
+ * tao/CDR.h
+ * tao/CDR.i
+ * tao/GIOP_Message_Base.cpp
+ * tao/GIOP_Message_Lite.cpp
+ * tao/IIOP_Profile.cpp
+ * tao/Invocation.cpp
+ * tao/ORB.cpp
+ * tao/Pluggable_Messaging_Utils.cpp
+ * tao/Synch_Reply_Dispatcher.cpp
+ * tao/TAO_Server_Request.cpp
+ * tao/DynamicInterface/DII_Reply_Dispatcher.cpp
+ * tao/Strategies/SHMIOP_Profile.cpp
+ * tao/Strategies/UIOP_Profile.cpp
+ * examples/PluggableUDP/DIOP/DIOP_Profile.cpp
+
+ Made changes relating to WChar implementation of GIOP 1.2.
+
Fri Jun 15 15:13:20 2001 Krishnakumar B <kitty@cs.wustl.edu>
* orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp:
diff --git a/TAO/examples/PluggableUDP/DIOP/DIOP_Profile.cpp b/TAO/examples/PluggableUDP/DIOP/DIOP_Profile.cpp
index 578e761ddd8..0cfe87e847e 100644
--- a/TAO/examples/PluggableUDP/DIOP/DIOP_Profile.cpp
+++ b/TAO/examples/PluggableUDP/DIOP/DIOP_Profile.cpp
@@ -470,6 +470,8 @@ TAO_DIOP_Profile::encode (TAO_OutputCDR &stream) const
this->orb_core ()->output_cdr_dblock_allocator (),
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 ());
@@ -502,6 +504,8 @@ TAO_DIOP_Profile::create_tagged_profile (void)
this->orb_core ()->output_cdr_dblock_allocator (),
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 ());
diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp
index 3b8dbdadf9f..4a5c307d38e 100644
--- a/TAO/tao/Any.cpp
+++ b/TAO/tao/Any.cpp
@@ -285,6 +285,8 @@ CORBA_Any::_tao_encode (TAO_OutputCDR &cdr,
TAO_InputCDR in (this->cdr_,
this->byte_order_,
+ TAO_DEF_GIOP_MAJOR,
+ TAO_DEF_GIOP_MINOR,
orb_core);
TAO_Marshal_Object::perform_append (this->type_.in (),
&in,
@@ -675,7 +677,7 @@ CORBA_Any::operator<<= (from_wstring ws)
static CORBA::Long _oc_wstring [] =
{
TAO_ENCAP_BYTE_ORDER, // native endian + padding; "tricky"
- ACE_static_cast (CORBA::Long, ws.bound_)
+ ACE_static_cast (CORBA::Long, ws.bound_)
};
CORBA::TypeCode_ptr tc = 0;
@@ -1599,6 +1601,8 @@ CORBA_Any::operator>>= (to_object obj) const
// object), but the Any does not belong to any ORB.
TAO_InputCDR stream (this->cdr_,
this->byte_order_,
+ TAO_DEF_GIOP_MAJOR,
+ TAO_DEF_GIOP_MINOR,
TAO_ORB_Core_instance ());
if (stream >> obj.ref_)
diff --git a/TAO/tao/Asynch_Reply_Dispatcher.cpp b/TAO/tao/Asynch_Reply_Dispatcher.cpp
index 1c9df1a2461..c49f9108950 100644
--- a/TAO/tao/Asynch_Reply_Dispatcher.cpp
+++ b/TAO/tao/Asynch_Reply_Dispatcher.cpp
@@ -21,6 +21,8 @@ ACE_RCSID(tao, Asynch_Reply_Dispatcher, "$Id$")
TAO_Asynch_Reply_Dispatcher_Base::TAO_Asynch_Reply_Dispatcher_Base (TAO_ORB_Core *orb_core)
: reply_cdr_ (orb_core->create_input_cdr_data_block (ACE_CDR::DEFAULT_BUFSIZE),
TAO_ENCAP_BYTE_ORDER,
+ TAO_DEF_GIOP_MAJOR,
+ TAO_DEF_GIOP_MINOR,
orb_core),
transport_ (0)
{
diff --git a/TAO/tao/CDR.cpp b/TAO/tao/CDR.cpp
index 890b563eb9d..07eb03a7cf2 100644
--- a/TAO/tao/CDR.cpp
+++ b/TAO/tao/CDR.cpp
@@ -78,6 +78,8 @@ TAO_OutputCDR::TAO_OutputCDR (size_t size,
ACE_Allocator *data_block_allocator,
ACE_Allocator* message_block_allocator,
size_t memcpy_tradeoff,
+ ACE_CDR::Octet major_version,
+ ACE_CDR::Octet minor_version,
ACE_Char_Codeset_Translator *char_translator,
ACE_WChar_Codeset_Translator *wchar_translator)
: ACE_OutputCDR (size,
@@ -85,7 +87,9 @@ TAO_OutputCDR::TAO_OutputCDR (size_t size,
buffer_allocator,
data_block_allocator,
message_block_allocator,
- memcpy_tradeoff)
+ memcpy_tradeoff,
+ major_version,
+ minor_version)
{
ACE_FUNCTION_TIMEPROBE (TAO_OUTPUT_CDR_CTOR1_ENTER);
this->char_translator_ = char_translator;
@@ -99,6 +103,8 @@ TAO_OutputCDR::TAO_OutputCDR (char *data,
ACE_Allocator *data_block_allocator,
ACE_Allocator* message_block_allocator,
size_t memcpy_tradeoff,
+ ACE_CDR::Octet major_version,
+ ACE_CDR::Octet minor_version,
ACE_Char_Codeset_Translator *char_translator,
ACE_WChar_Codeset_Translator *wchar_translator)
: ACE_OutputCDR (data,
@@ -107,7 +113,9 @@ TAO_OutputCDR::TAO_OutputCDR (char *data,
buffer_allocator,
data_block_allocator,
message_block_allocator,
- memcpy_tradeoff)
+ memcpy_tradeoff,
+ major_version,
+ minor_version)
{
ACE_FUNCTION_TIMEPROBE (TAO_OUTPUT_CDR_CTOR2_ENTER);
this->char_translator_ = char_translator;
@@ -117,11 +125,15 @@ TAO_OutputCDR::TAO_OutputCDR (char *data,
TAO_OutputCDR::TAO_OutputCDR (ACE_Message_Block *data,
int byte_order,
size_t memcpy_tradeoff,
+ ACE_CDR::Octet major_version,
+ ACE_CDR::Octet minor_version,
ACE_Char_Codeset_Translator *char_translator,
ACE_WChar_Codeset_Translator *wchar_translator)
: ACE_OutputCDR (data,
byte_order,
- memcpy_tradeoff)
+ memcpy_tradeoff,
+ major_version,
+ minor_version)
{
ACE_FUNCTION_TIMEPROBE (TAO_OUTPUT_CDR_CTOR3_ENTER);
this->char_translator_ = char_translator;
diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h
index 7e10ba3d262..c920c2ca4b6 100644
--- a/TAO/tao/CDR.h
+++ b/TAO/tao/CDR.h
@@ -89,6 +89,10 @@ public:
ACE_Allocator* data_block_allocator = 0,
ACE_Allocator* message_block_allocator = 0,
size_t memcpy_tradeoff = 0,
+ ACE_CDR::Octet major_version =
+ TAO_DEF_GIOP_MAJOR,
+ ACE_CDR::Octet minor_version =
+ TAO_DEF_GIOP_MINOR,
ACE_Char_Codeset_Translator *char_translator = 0,
ACE_WChar_Codeset_Translator *wchar_translator = 0);
@@ -101,6 +105,10 @@ public:
ACE_Allocator* data_block_allocator = 0,
ACE_Allocator* message_block_allocator = 0,
size_t memcpy_tradeoff = 0,
+ ACE_CDR::Octet major_version =
+ TAO_DEF_GIOP_MAJOR,
+ ACE_CDR::Octet minor_version =
+ TAO_DEF_GIOP_MINOR,
ACE_Char_Codeset_Translator *char_translator = 0,
ACE_WChar_Codeset_Translator *wchar_translator = 0);
@@ -109,6 +117,10 @@ public:
TAO_OutputCDR (ACE_Message_Block *data,
int byte_order = ACE_CDR_BYTE_ORDER,
size_t memcpy_tradeoff = 0,
+ ACE_CDR::Octet major_version =
+ TAO_DEF_GIOP_MAJOR,
+ ACE_CDR::Octet minor_version =
+ TAO_DEF_GIOP_MINOR,
ACE_Char_Codeset_Translator *char_translator = 0,
ACE_WChar_Codeset_Translator *wchar_translator = 0);
@@ -157,22 +169,38 @@ public:
TAO_InputCDR (const char* buf,
size_t bufsiz,
int byte_order = ACE_CDR_BYTE_ORDER,
+ ACE_CDR::Octet major_version =
+ TAO_DEF_GIOP_MAJOR,
+ ACE_CDR::Octet minor_version =
+ TAO_DEF_GIOP_MINOR,
TAO_ORB_Core* orb_core = 0);
/// Create an empty input stream. The caller is responsible for
/// putting the right data and providing the right alignment.
TAO_InputCDR (size_t bufsiz,
int byte_order = ACE_CDR_BYTE_ORDER,
+ ACE_CDR::Octet major_version =
+ TAO_DEF_GIOP_MAJOR,
+ ACE_CDR::Octet minor_version =
+ TAO_DEF_GIOP_MINOR,
TAO_ORB_Core* orb_core = 0);
/// Create an input stream from an ACE_Message_Block
TAO_InputCDR (const ACE_Message_Block *data,
int byte_order = ACE_CDR_BYTE_ORDER,
+ ACE_CDR::Octet major_version =
+ TAO_DEF_GIOP_MAJOR,
+ ACE_CDR::Octet minor_version =
+ TAO_DEF_GIOP_MINOR,
TAO_ORB_Core* orb_core = 0);
/// Create an input stream from an ACE_Data_Block
TAO_InputCDR (ACE_Data_Block *data,
int byte_order = ACE_CDR_BYTE_ORDER,
+ ACE_CDR::Octet major_version =
+ TAO_DEF_GIOP_MAJOR,
+ ACE_CDR::Octet minor_version =
+ TAO_DEF_GIOP_MINOR,
TAO_ORB_Core* orb_core = 0);
/// Create an input stream from an ACE_Data_Block
@@ -180,6 +208,10 @@ public:
size_t read_pointer_position,
size_t write_pointer_position,
int byte_order = ACE_CDR_BYTE_ORDER,
+ ACE_CDR::Octet major_version =
+ TAO_DEF_GIOP_MAJOR,
+ ACE_CDR::Octet minor_version =
+ TAO_DEF_GIOP_MINOR,
TAO_ORB_Core* orb_core = 0);
/**
@@ -194,7 +226,6 @@ public:
TAO_InputCDR (const TAO_InputCDR& rhs,
size_t size,
ACE_CDR::Long offset);
-
/**
* This creates an encapsulated stream, the first byte must be (per
* the spec) the byte order of the encapsulation. The default
diff --git a/TAO/tao/CDR.i b/TAO/tao/CDR.i
index 3c39bd41b13..b99805a79f0 100644
--- a/TAO/tao/CDR.i
+++ b/TAO/tao/CDR.i
@@ -10,10 +10,14 @@ ACE_INLINE
TAO_InputCDR::TAO_InputCDR (const char *buf,
size_t bufsiz,
int byte_order,
+ ACE_CDR::Octet major_version,
+ ACE_CDR::Octet minor_version,
TAO_ORB_Core* orb_core)
: ACE_InputCDR (buf,
bufsiz,
- byte_order),
+ byte_order,
+ major_version,
+ minor_version),
orb_core_ (orb_core)
{
this->init_translators ();
@@ -22,9 +26,13 @@ TAO_InputCDR::TAO_InputCDR (const char *buf,
ACE_INLINE
TAO_InputCDR::TAO_InputCDR (size_t bufsiz,
int byte_order,
+ ACE_CDR::Octet major_version,
+ ACE_CDR::Octet minor_version,
TAO_ORB_Core* orb_core)
: ACE_InputCDR (bufsiz,
- byte_order),
+ byte_order,
+ major_version,
+ minor_version),
orb_core_ (orb_core)
{
this->init_translators ();
@@ -33,9 +41,13 @@ TAO_InputCDR::TAO_InputCDR (size_t bufsiz,
ACE_INLINE
TAO_InputCDR::TAO_InputCDR (const ACE_Message_Block *data,
int byte_order,
+ ACE_CDR::Octet major_version,
+ ACE_CDR::Octet minor_version,
TAO_ORB_Core* orb_core)
: ACE_InputCDR (data,
- byte_order),
+ byte_order,
+ major_version,
+ minor_version),
orb_core_ (orb_core)
{
this->init_translators ();
@@ -44,9 +56,13 @@ TAO_InputCDR::TAO_InputCDR (const ACE_Message_Block *data,
ACE_INLINE
TAO_InputCDR::TAO_InputCDR (ACE_Data_Block *data,
int byte_order,
+ ACE_CDR::Octet major_version,
+ ACE_CDR::Octet minor_version,
TAO_ORB_Core* orb_core)
: ACE_InputCDR (data,
- byte_order),
+ byte_order,
+ major_version,
+ minor_version),
orb_core_ (orb_core)
{
this->init_translators ();
@@ -58,11 +74,15 @@ TAO_InputCDR::TAO_InputCDR (ACE_Data_Block *data,
size_t rd_pos,
size_t wr_pos,
int byte_order,
+ ACE_CDR::Octet major_version,
+ ACE_CDR::Octet minor_version,
TAO_ORB_Core* orb_core)
: ACE_InputCDR (data,
rd_pos,
wr_pos,
- byte_order),
+ byte_order,
+ major_version,
+ minor_version),
orb_core_ (orb_core)
{
this->init_translators ();
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
index d2d42dcbb44..1b60a05ec77 100644
--- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
+++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
@@ -22,6 +22,8 @@ TAO_DII_Deferred_Reply_Dispatcher::TAO_DII_Deferred_Reply_Dispatcher (
: TAO_Asynch_Reply_Dispatcher_Base (orb_core),
reply_cdr_ (orb_core->create_input_cdr_data_block (ACE_CDR::DEFAULT_BUFSIZE),
TAO_ENCAP_BYTE_ORDER,
+ TAO_DEF_GIOP_MAJOR,
+ TAO_DEF_GIOP_MINOR,
orb_core),
req_ (req)
diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp
index 115c06570ae..9b57b1b72a9 100644
--- a/TAO/tao/GIOP_Message_Base.cpp
+++ b/TAO/tao/GIOP_Message_Base.cpp
@@ -38,6 +38,8 @@ TAO_GIOP_Message_Base::TAO_GIOP_Message_Base (TAO_ORB_Core *orb_core,
orb_core->message_block_dblock_allocator (),
orb_core->message_block_msgblock_allocator (),
orb_core->orb_params ()->cdr_memcpy_tradeoff (),
+ TAO_DEF_GIOP_MAJOR,
+ TAO_DEF_GIOP_MINOR,
orb_core->to_iso8859 (),
orb_core->to_unicode ()));
}
@@ -326,6 +328,8 @@ TAO_GIOP_Message_Base::process_request_message (TAO_Transport *transport,
size_t rd_pos = this->message_handler_.rd_pos ();
size_t wr_pos = this->message_handler_.wr_pos ();
+ TAO_GIOP_Message_State &state =
+ this->message_handler_.message_state ();
// Create a input CDR stream.
// NOTE: We use the same data block in which we read the message and
@@ -335,8 +339,14 @@ TAO_GIOP_Message_Base::process_request_message (TAO_Transport *transport,
rd_pos,
wr_pos,
this->message_handler_.message_state ().byte_order,
+ state.giop_version.major,
+ state.giop_version.minor,
orb_core);
+ // Set giop version info for the outstream so that server replies
+ // in correct GIOP version
+ output_->set_version (state.giop_version.major, state.giop_version.minor);
+
// Reset the message handler to receive upcalls if any
this->message_handler_.reset (0);
@@ -375,6 +385,8 @@ TAO_GIOP_Message_Base::process_reply_message (
size_t rd_pos = this->message_handler_.rd_pos ();
size_t wr_pos = this->message_handler_.wr_pos ();
+ TAO_GIOP_Message_State &state =
+ this->message_handler_.message_state ();
// Create a input CDR stream.
// NOTE: We use the same data block in which we read the message and
@@ -383,8 +395,9 @@ TAO_GIOP_Message_Base::process_reply_message (
TAO_InputCDR input_cdr (this->message_handler_.steal_data_block (),
rd_pos,
wr_pos,
- this->message_handler_.message_state ().byte_order);
-
+ this->message_handler_.message_state ().byte_order,
+ state.giop_version.major,
+ state.giop_version.minor);
// Reset the message state. Now, we are ready for the next nested
// upcall if any.
@@ -1046,6 +1059,8 @@ TAO_GIOP_Message_Base::send_reply_exception (
orb_core->output_cdr_dblock_allocator (),
orb_core->output_cdr_msgblock_allocator (),
orb_core->orb_params ()->cdr_memcpy_tradeoff (),
+ TAO_DEF_GIOP_MAJOR,
+ TAO_DEF_GIOP_MINOR,
orb_core->to_iso8859 (),
orb_core->to_unicode ());
diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp
index a7c7612f23d..5a33810655b 100644
--- a/TAO/tao/GIOP_Message_Lite.cpp
+++ b/TAO/tao/GIOP_Message_Lite.cpp
@@ -37,6 +37,8 @@ TAO_GIOP_Message_Lite::TAO_GIOP_Message_Lite (TAO_ORB_Core *orb_core,
),
input_cdr_ (orb_core->create_input_cdr_data_block (input_cdr_size),
TAO_ENCAP_BYTE_ORDER,
+ TAO_DEF_GIOP_MAJOR,
+ TAO_DEF_GIOP_MINOR,
orb_core),
current_offset_ (0)
{
@@ -53,6 +55,8 @@ TAO_GIOP_Message_Lite::TAO_GIOP_Message_Lite (TAO_ORB_Core *orb_core,
this->cdr_dblock_alloc_,
this->cdr_msgblock_alloc_,
orb_core->orb_params ()->cdr_memcpy_tradeoff (),
+ TAO_DEF_GIOP_MAJOR,
+ TAO_DEF_GIOP_MINOR,
orb_core->to_iso8859 (),
orb_core->to_unicode ()));
}
@@ -442,7 +446,7 @@ TAO_GIOP_Message_Lite::process_request_message (TAO_Transport *transport,
// Steal the input CDR from the message state.
TAO_InputCDR input_cdr (ACE_InputCDR::Transfer_Contents (this->input_cdr_),
- orb_core);
+ orb_core);
// Send the message state for the service layer like FT to log the
// messages
@@ -1256,6 +1260,8 @@ TAO_GIOP_Message_Lite::send_reply_exception (
orb_core->output_cdr_dblock_allocator (),
orb_core->output_cdr_msgblock_allocator (),
orb_core->orb_params ()->cdr_memcpy_tradeoff (),
+ TAO_DEF_GIOP_MAJOR,
+ TAO_DEF_GIOP_MINOR,
orb_core->to_iso8859 (),
orb_core->to_unicode ());
diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp
index 4e24058b042..693c2451380 100644
--- a/TAO/tao/IIOP_Profile.cpp
+++ b/TAO/tao/IIOP_Profile.cpp
@@ -432,6 +432,8 @@ TAO_IIOP_Profile::encode (TAO_OutputCDR &stream) const
this->orb_core ()->output_cdr_dblock_allocator (),
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 ());
@@ -464,6 +466,8 @@ TAO_IIOP_Profile::create_tagged_profile (void)
this->orb_core ()->output_cdr_dblock_allocator (),
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 ());
diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp
index f1ebf25e7b0..5f975f1e7b5 100644
--- a/TAO/tao/Invocation.cpp
+++ b/TAO/tao/Invocation.cpp
@@ -116,6 +116,8 @@ TAO_GIOP_Invocation::TAO_GIOP_Invocation (TAO_Stub *stub,
orb_core->output_cdr_dblock_allocator (),
orb_core->output_cdr_msgblock_allocator (),
orb_core->orb_params ()->cdr_memcpy_tradeoff (),
+ TAO_DEF_GIOP_MAJOR,
+ TAO_DEF_GIOP_MINOR,
orb_core->to_iso8859 (),
orb_core->to_unicode ()),
orb_core_ (orb_core),
@@ -258,6 +260,10 @@ TAO_GIOP_Invocation::perform_call (TAO_Transport_Descriptor_Interface &desc,
const TAO_GIOP_Message_Version& version = this->profile_->version ();
result = this->transport_->messaging_init (version.major,
version.minor);
+
+ // Set the giop version of the out stream
+ this->out_stream_.set_version (version.major, version.minor);
+
if (result == -1)
{
if (TAO_debug_level > 0)
@@ -875,7 +881,7 @@ TAO_GIOP_Twoway_Invocation::invoke (TAO_Exception_Data *excepts,
// If we couldn't find the right exception, report it as
// CORBA::UNKNOWN.
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_OMG_VMCID | 1,
+ ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE,
CORBA::COMPLETED_YES),
TAO_INVOKE_EXCEPTION);
}
@@ -956,7 +962,7 @@ TAO_GIOP_Oneway_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV)
// This kind of exception shouldn't happen with oneways,
// but if it does, we turn it into a CORBA::UNKNOWN exception.
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_OMG_VMCID | 1,
+ ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE,
CORBA::COMPLETED_YES),
TAO_INVOKE_EXCEPTION);
}
@@ -1021,7 +1027,7 @@ TAO_GIOP_Locate_Request_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV)
// This kind of exception shouldn't happen with oneways,
// but if it does, we turn it into a CORBA::UNKNOWN exception.
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_OMG_VMCID | 1,
+ ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE,
CORBA::COMPLETED_YES),
TAO_INVOKE_EXCEPTION);
}
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 8a05dbdfb06..f54ba3a1d1f 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -1781,6 +1781,8 @@ CORBA_ORB::object_to_string (CORBA::Object_ptr obj,
this->orb_core_->output_cdr_dblock_allocator (),
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 ());
@@ -1979,7 +1981,8 @@ CORBA_ORB::ior_string_to_object (const char *str,
int byte_order = *(mb.rd_ptr ());
mb.rd_ptr (1);
mb.wr_ptr (len);
- TAO_InputCDR stream (&mb, byte_order, this->orb_core_);
+ TAO_InputCDR stream (&mb, byte_order, TAO_DEF_GIOP_MAJOR,
+ TAO_DEF_GIOP_MINOR, this->orb_core_);
CORBA::Object_ptr objref = CORBA::Object::_nil ();
stream >> objref;
diff --git a/TAO/tao/Pluggable_Messaging_Utils.cpp b/TAO/tao/Pluggable_Messaging_Utils.cpp
index d954c8299b3..b82e68a38fc 100644
--- a/TAO/tao/Pluggable_Messaging_Utils.cpp
+++ b/TAO/tao/Pluggable_Messaging_Utils.cpp
@@ -15,6 +15,8 @@ TAO_Pluggable_Reply_Params::TAO_Pluggable_Reply_Params (
ACE_CDR::DEFAULT_BUFSIZE
),
TAO_ENCAP_BYTE_ORDER,
+ TAO_DEF_GIOP_MAJOR,
+ TAO_DEF_GIOP_MINOR,
orb_core)
{
}
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp
index 287ca92f9d5..622d97a5de2 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp
@@ -444,6 +444,8 @@ TAO_SHMIOP_Profile::encode (TAO_OutputCDR &stream) const
this->orb_core ()->output_cdr_dblock_allocator (),
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 ());
@@ -472,6 +474,8 @@ TAO_SHMIOP_Profile::create_tagged_profile (void)
this->orb_core ()->output_cdr_dblock_allocator (),
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 ());
diff --git a/TAO/tao/Strategies/UIOP_Profile.cpp b/TAO/tao/Strategies/UIOP_Profile.cpp
index d5fe4796953..fbe302c795c 100644
--- a/TAO/tao/Strategies/UIOP_Profile.cpp
+++ b/TAO/tao/Strategies/UIOP_Profile.cpp
@@ -385,6 +385,8 @@ TAO_UIOP_Profile::encode (TAO_OutputCDR &stream) const
this->orb_core ()->output_cdr_dblock_allocator (),
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 ());
@@ -414,6 +416,8 @@ TAO_UIOP_Profile::create_tagged_profile (void)
this->orb_core ()->output_cdr_dblock_allocator (),
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 ());
diff --git a/TAO/tao/Synch_Reply_Dispatcher.cpp b/TAO/tao/Synch_Reply_Dispatcher.cpp
index 3d623992f38..2c9392479a0 100644
--- a/TAO/tao/Synch_Reply_Dispatcher.cpp
+++ b/TAO/tao/Synch_Reply_Dispatcher.cpp
@@ -19,6 +19,8 @@ TAO_Synch_Reply_Dispatcher::TAO_Synch_Reply_Dispatcher (
wait_strategy_ (0),
reply_cdr_ (orb_core->create_input_cdr_data_block (ACE_CDR::DEFAULT_BUFSIZE),
TAO_ENCAP_BYTE_ORDER,
+ TAO_DEF_GIOP_MAJOR,
+ TAO_DEF_GIOP_MINOR,
orb_core),
leader_follower_condition_variable_ (0)
{
diff --git a/TAO/tao/TAO_Server_Request.cpp b/TAO/tao/TAO_Server_Request.cpp
index 07a71c6c82b..c17d1f68ce1 100644
--- a/TAO/tao/TAO_Server_Request.cpp
+++ b/TAO/tao/TAO_Server_Request.cpp
@@ -287,6 +287,8 @@ TAO_ServerRequest::tao_send_reply_exception (CORBA::Exception &ex)
this->orb_core_->output_cdr_dblock_allocator (),
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 ());
View Lorry Controller Status