ChangelogTag: Wed June 26 2:09:00 2002 Yamuna Krishnamurthy <yamuna@oomworks.com

3 files changed, 57 insertions, 29 deletions

diff --git a/TAO/tao/RTCORBA/RTCORBA.pidl b/TAO/tao/RTCORBA/RTCORBA.pidl
index b3cc3b38d7d..468ce6aa711 100644
--- a/TAO/tao/RTCORBA/RTCORBA.pidl
+++ b/TAO/tao/RTCORBA/RTCORBA.pidl
@@ -68,7 +68,10 @@ module RTCORBA
 
   native PriorityMapping;
   native PriorityTransform;
-
+ 
+  typedef long NetworkPriority;	
+  native NetworkPriorityMapping;	
+	
   // Threadpool types.
   typedef unsigned long ThreadpoolId;
 
@@ -146,6 +149,7 @@ module RTCORBA
     attribute boolean keep_alive;
     attribute boolean dont_route;
     attribute boolean no_delay;
+    attribute boolean enable_network_priority;	
   };
 
   local interface GIOPProtocolProperties : ProtocolProperties {};
diff --git a/TAO/tao/RTCORBA/RTCORBAC.cpp b/TAO/tao/RTCORBA/RTCORBAC.cpp
index d507b3aeaa4..a5d3bedc743 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.cpp
+++ b/TAO/tao/RTCORBA/RTCORBAC.cpp
@@ -5207,10 +5207,8 @@ const char* RTCORBA::RTORB::_interface_repository_id (void) const
 
 // Default constructor.
 RTCORBA::RTORB::MutexNotFound::MutexNotFound (void)
-  : CORBA_UserException (
-        "IDL:omg.org/RTCORBA/RTORB/MutexNotFound:1.0",
-        "MutexNotFound"
-      )
+  : CORBA_UserException ("IDL:omg.org/RTCORBA/RTORB/MutexNotFound:1.0",
+			 "MutexNotFound")
 {
 }
 
@@ -5221,10 +5219,9 @@ RTCORBA::RTORB::MutexNotFound::~MutexNotFound (void)
 
 // Copy constructor.
 RTCORBA::RTORB::MutexNotFound::MutexNotFound (const ::RTCORBA::RTORB::MutexNotFound &_tao_excp)
-  : CORBA_UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
+  : CORBA_UserException (_tao_excp._rep_id () ,
+			 _tao_excp._name ()
+)
 {
 }
 
@@ -5232,7 +5229,7 @@ RTCORBA::RTORB::MutexNotFound::MutexNotFound (const ::RTCORBA::RTORB::MutexNotFo
 RTCORBA::RTORB::MutexNotFound&
 RTCORBA::RTORB::MutexNotFound::operator= (const ::RTCORBA::RTORB::MutexNotFound &_tao_excp)
 {
-  this->CORBA_UserException::operator= (_tao_excp);
+ this->CORBA_UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -5291,10 +5288,9 @@ void RTCORBA::RTORB::MutexNotFound::_tao_decode (
 
 // Default constructor.
 RTCORBA::RTORB::InvalidThreadpool::InvalidThreadpool (void)
-  : CORBA_UserException (
-        "IDL:omg.org/RTCORBA/RTORB/InvalidThreadpool:1.0",
-        "InvalidThreadpool"
-      )
+  : CORBA_UserException ("IDL:omg.org/RTCORBA/RTORB/InvalidThreadpool:1.0",
+			 "InvalidThreadpool"
+			 )
 {
 }
 
@@ -5305,10 +5301,9 @@ RTCORBA::RTORB::InvalidThreadpool::~InvalidThreadpool (void)
 
 // Copy constructor.
 RTCORBA::RTORB::InvalidThreadpool::InvalidThreadpool (const ::RTCORBA::RTORB::InvalidThreadpool &_tao_excp)
-  : CORBA_UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
+  : CORBA_UserException (_tao_excp._rep_id (),
+			 _tao_excp._name ()
+			 )
 {
 }
 
@@ -5885,16 +5880,16 @@ CORBA::Boolean operator>> (
   CORBA::ULong _tao_seq_len;
   if (strm >> _tao_seq_len)
   {
-    // Add a check to the length of the sequence
-    // to make sure it does not exceed the length
-    // of the stream. (See bug 1159.)
-    if (_tao_seq_len > strm.length())
-      return 0;
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
     if (0 >= _tao_seq_len)
       return 1;
+    // Add a check to the length of the sequence
+    // to make sure it does not exceed the length
+    // of the stream. (See bug 58.)
+    if (_tao_seq_len > strm.length())
+      return 0;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
@@ -5932,16 +5927,16 @@ CORBA::Boolean operator>> (
   CORBA::ULong _tao_seq_len;
   if (strm >> _tao_seq_len)
   {
-    // Add a check to the length of the sequence
-    // to make sure it does not exceed the length
-    // of the stream. (See bug 1159.)
-    if (_tao_seq_len > strm.length())
-      return 0;
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
     if (0 >= _tao_seq_len)
       return 1;
+    // Add a check to the length of the sequence
+    // to make sure it does not exceed the length
+    // of the stream. (See bug 58.)
+    if (_tao_seq_len > strm.length())
+      return 0;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
diff --git a/TAO/tao/RTCORBA/RTCORBAC.h b/TAO/tao/RTCORBA/RTCORBAC.h
index f8c164effd3..2c387862c42 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.h
+++ b/TAO/tao/RTCORBA/RTCORBAC.h
@@ -39,6 +39,10 @@ class TAO_Priority_Mapping_Manager;
 class TAO_Priority_Mapping_Manager_var;
 class TAO_Priority_Mapping_Manager_out;
 class TAO_Priority_Mapping;
+class TAO_Network_Priority_Mapping_Manager;
+class TAO_Network_Priority_Mapping_Manager_var;
+class TAO_Network_Priority_Mapping_Manager_out;
+class TAO_Network_Priority_Mapping;
 
 #ifndef TAO_RTCORBA_SAFE_INCLUDE
 #error "You should not include RTCORBAC.h directly, use RTCORBA.h"
@@ -75,7 +79,15 @@ TAO_NAMESPACE  RTCORBA
   typedef TAO_Priority_Mapping_Manager_var PriorityMappingManager_var;
   typedef TAO_Priority_Mapping_Manager_out PriorityMappingManager_out;
 
+  typedef TAO_Network_Priority_Mapping_Manager NetworkPriorityMappingManager;
+  typedef TAO_Network_Priority_Mapping_Manager *NetworkPriorityMappingManager_ptr;
+  typedef TAO_Network_Priority_Mapping_Manager_var NetworkPriorityMappingManager_var;
+  typedef TAO_Network_Priority_Mapping_Manager_out NetworkPriorityMappingManager_out;
+
+  typedef CORBA::Long NetworkPriority;
+  
   typedef TAO_Priority_Mapping PriorityMapping;
+  typedef TAO_Network_Priority_Mapping NetworkPriorityMapping;
   // End TAO-specific
 
   typedef CORBA::Short NativePriority;
@@ -1570,6 +1582,22 @@ TAO_NAMESPACE  RTCORBA
         CORBA::SystemException
       )) = 0;
 
+    virtual CORBA::Boolean enable_network_priority (
+						    
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual void enable_network_priority (
+        CORBA::Boolean no_delay
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
 
     virtual const char* _interface_repository_id (void) const;
@@ -2898,7 +2926,8 @@ TAO_NAMESPACE  RTCORBA
         CORBA::Long recv_buffer_size,
         CORBA::Boolean keep_alive,
         CORBA::Boolean dont_route,
-        CORBA::Boolean no_delay
+        CORBA::Boolean no_delay,
+	CORBA::Boolean enable_network_priority
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((