ChangeLogTag: Wed Oct 6 10:33:00 1999 Michael Kircher <Michael.Kircher@mchp.siemens.de>

5 files changed, 198 insertions, 218 deletions

diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index ea7b727c5c1..40794210ce1 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,12 @@
+Wed Oct  6 10:33:00 1999  Michael Kircher  <Michael.Kircher@mchp.siemens.de>
+
+	* tao/MessagingC.h,
+	  tao/MessagingC.i,
+	  tao/MessagingC.cpp: In the .cpp file file were inline
+	  methods, moved these to the .i file.
+
+	* tao/Reply_Dispatcher.cpp: Cosmetic changes.
+
 Wed Oct  6 07:23:23 1999  Michael Kircher  <Michael.Kircher@mchp.siemens.de>
 
 	* tests/AMI/client.cpp,
diff --git a/TAO/tao/MessagingC.cpp b/TAO/tao/MessagingC.cpp
index a7a6ae684c6..40b2bb2bbfa 100644
--- a/TAO/tao/MessagingC.cpp
+++ b/TAO/tao/MessagingC.cpp
@@ -1566,194 +1566,6 @@ OBV_Messaging::ExceptionHolder::byte_order (void) const
   return this->_pd_byte_order;
 }
 
-
-#if !defined (_MESSAGING_EXCEPTIONHOLDER__TAO_SEQ_OCTET_CS_)
-#define _MESSAGING_EXCEPTIONHOLDER__TAO_SEQ_OCTET_CS_
-
-// *************************************************************
-// Inline operations for class Messaging::ExceptionHolder::_tao_seq_Octet_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::ExceptionHolder::_tao_seq_Octet_var::_tao_seq_Octet_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-Messaging::ExceptionHolder::_tao_seq_Octet_var::_tao_seq_Octet_var (Messaging::ExceptionHolder::_tao_seq_Octet *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-Messaging::ExceptionHolder::_tao_seq_Octet_var::_tao_seq_Octet_var (const Messaging::ExceptionHolder::_tao_seq_Octet_var &p) // copy constructor
-{
-  if (p.ptr_)
-    ACE_NEW (this->ptr_, Messaging::ExceptionHolder::_tao_seq_Octet (*p.ptr_));
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-Messaging::ExceptionHolder::_tao_seq_Octet_var::~_tao_seq_Octet_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE Messaging::ExceptionHolder::_tao_seq_Octet_var &
-Messaging::ExceptionHolder::_tao_seq_Octet_var::operator= (Messaging::ExceptionHolder::_tao_seq_Octet *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::ExceptionHolder::_tao_seq_Octet_var &
-Messaging::ExceptionHolder::_tao_seq_Octet_var::operator= (const Messaging::ExceptionHolder::_tao_seq_Octet_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, Messaging::ExceptionHolder::_tao_seq_Octet (*p.ptr_), *this);
-  }
-  return *this;
-}
-
-ACE_INLINE const Messaging::ExceptionHolder::_tao_seq_Octet *
-Messaging::ExceptionHolder::_tao_seq_Octet_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ExceptionHolder::_tao_seq_Octet *
-Messaging::ExceptionHolder::_tao_seq_Octet_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-Messaging::ExceptionHolder::_tao_seq_Octet_var::operator const Messaging::ExceptionHolder::_tao_seq_Octet &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-Messaging::ExceptionHolder::_tao_seq_Octet_var::operator Messaging::ExceptionHolder::_tao_seq_Octet &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-Messaging::ExceptionHolder::_tao_seq_Octet_var::operator Messaging::ExceptionHolder::_tao_seq_Octet &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::Octet &
-Messaging::ExceptionHolder::_tao_seq_Octet_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const Messaging::ExceptionHolder::_tao_seq_Octet &
-Messaging::ExceptionHolder::_tao_seq_Octet_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE Messaging::ExceptionHolder::_tao_seq_Octet &
-Messaging::ExceptionHolder::_tao_seq_Octet_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE Messaging::ExceptionHolder::_tao_seq_Octet *&
-Messaging::ExceptionHolder::_tao_seq_Octet_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ExceptionHolder::_tao_seq_Octet *
-Messaging::ExceptionHolder::_tao_seq_Octet_var::_retn (void)
-{
-  Messaging::ExceptionHolder::_tao_seq_Octet *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE Messaging::ExceptionHolder::_tao_seq_Octet *
-Messaging::ExceptionHolder::_tao_seq_Octet_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::ExceptionHolder::_tao_seq_Octet_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::ExceptionHolder::_tao_seq_Octet_out::_tao_seq_Octet_out (Messaging::ExceptionHolder::_tao_seq_Octet *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-Messaging::ExceptionHolder::_tao_seq_Octet_out::_tao_seq_Octet_out (Messaging::ExceptionHolder::_tao_seq_Octet_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-Messaging::ExceptionHolder::_tao_seq_Octet_out::_tao_seq_Octet_out (const Messaging::ExceptionHolder::_tao_seq_Octet_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Messaging::ExceptionHolder::_tao_seq_Octet_out&,p).ptr_)
-{}
-
-ACE_INLINE Messaging::ExceptionHolder::_tao_seq_Octet_out &
-Messaging::ExceptionHolder::_tao_seq_Octet_out::operator= (const Messaging::ExceptionHolder::_tao_seq_Octet_out &p)
-{
-  this->ptr_ = ACE_const_cast (Messaging::ExceptionHolder::_tao_seq_Octet_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::ExceptionHolder::_tao_seq_Octet_out &
-Messaging::ExceptionHolder::_tao_seq_Octet_out::operator= (Messaging::ExceptionHolder::_tao_seq_Octet *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-Messaging::ExceptionHolder::_tao_seq_Octet_out::operator Messaging::ExceptionHolder::_tao_seq_Octet *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ExceptionHolder::_tao_seq_Octet *&
-Messaging::ExceptionHolder::_tao_seq_Octet_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ExceptionHolder::_tao_seq_Octet *
-Messaging::ExceptionHolder::_tao_seq_Octet_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Octet &
-Messaging::ExceptionHolder::_tao_seq_Octet_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-
-#endif /* end #if !defined */
-
 // accessor to set the member
 void
 OBV_Messaging::ExceptionHolder::marshaled_exception (const Messaging::ExceptionHolder::_tao_seq_Octet &val)
diff --git a/TAO/tao/MessagingC.h b/TAO/tao/MessagingC.h
index de9894176ab..e2b7f3cb701 100644
--- a/TAO/tao/MessagingC.h
+++ b/TAO/tao/MessagingC.h
@@ -1783,8 +1783,8 @@ TAO_NAMESPACE  Messaging
 
 
   protected:
-    ExceptionHolder (void) { };           // default constructor
-    virtual ~ExceptionHolder (void) { };
+    ExceptionHolder (void);           // default constructor
+    virtual ~ExceptionHolder (void);
 
     // TAO internals
     virtual void *_tao_obv_narrow (ptr_arith_t);
@@ -2045,7 +2045,7 @@ TAO_NAMESPACE  OBV_Messaging
 
 
   private:
-        CORBA::Boolean _pd_is_system_exception;
+    CORBA::Boolean _pd_is_system_exception;
     CORBA::Boolean _pd_byte_order;
 #if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef _tao_seq_Octet _marshaled_exception_seq;
@@ -2069,7 +2069,6 @@ class TAO_InputCDR;
 
 #if defined (TAO_HAS_AMI_CALLBACK)
 
-// @@ Michael: Addition
 
 enum TAO_AMI_Reply_Status
 {
diff --git a/TAO/tao/MessagingC.i b/TAO/tao/MessagingC.i
index 0322413dc80..c950e0ee245 100644
--- a/TAO/tao/MessagingC.i
+++ b/TAO/tao/MessagingC.i
@@ -3021,7 +3021,190 @@ Messaging::PolicyValueSeq_out::operator[] (CORBA::ULong slot)
 
 
 #if defined (TAO_HAS_AMI_CALLBACK)
-/*
+
+// *************************************************************
+// Inline operations for class Messaging::ExceptionHolder::_tao_seq_Octet_var
+// *************************************************************
+
+ACE_INLINE
+Messaging::ExceptionHolder::_tao_seq_Octet_var::_tao_seq_Octet_var (void) // default constructor
+  : ptr_ (0)
+{}
+
+ACE_INLINE
+Messaging::ExceptionHolder::_tao_seq_Octet_var::_tao_seq_Octet_var (Messaging::ExceptionHolder::_tao_seq_Octet *p)
+  : ptr_ (p)
+{}
+
+ACE_INLINE
+Messaging::ExceptionHolder::_tao_seq_Octet_var::_tao_seq_Octet_var (const Messaging::ExceptionHolder::_tao_seq_Octet_var &p) // copy constructor
+{
+  if (p.ptr_)
+    ACE_NEW (this->ptr_, Messaging::ExceptionHolder::_tao_seq_Octet (*p.ptr_));
+  else
+    this->ptr_ = 0;
+}
+
+ACE_INLINE
+Messaging::ExceptionHolder::_tao_seq_Octet_var::~_tao_seq_Octet_var (void) // destructor
+{
+  delete this->ptr_;
+}
+
+ACE_INLINE Messaging::ExceptionHolder::_tao_seq_Octet_var &
+Messaging::ExceptionHolder::_tao_seq_Octet_var::operator= (Messaging::ExceptionHolder::_tao_seq_Octet *p)
+{
+  delete this->ptr_;
+  this->ptr_ = p;
+  return *this;
+}
+
+ACE_INLINE Messaging::ExceptionHolder::_tao_seq_Octet_var &
+Messaging::ExceptionHolder::_tao_seq_Octet_var::operator= (const Messaging::ExceptionHolder::_tao_seq_Octet_var &p) // deep copy
+{
+  if (this != &p)
+  {
+    delete this->ptr_;
+    ACE_NEW_RETURN (this->ptr_, Messaging::ExceptionHolder::_tao_seq_Octet (*p.ptr_), *this);
+  }
+  return *this;
+}
+
+ACE_INLINE const Messaging::ExceptionHolder::_tao_seq_Octet *
+Messaging::ExceptionHolder::_tao_seq_Octet_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+ACE_INLINE Messaging::ExceptionHolder::_tao_seq_Octet *
+Messaging::ExceptionHolder::_tao_seq_Octet_var::operator-> (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE 
+Messaging::ExceptionHolder::_tao_seq_Octet_var::operator const Messaging::ExceptionHolder::_tao_seq_Octet &() const // cast
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE 
+Messaging::ExceptionHolder::_tao_seq_Octet_var::operator Messaging::ExceptionHolder::_tao_seq_Octet &() // cast 
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE 
+Messaging::ExceptionHolder::_tao_seq_Octet_var::operator Messaging::ExceptionHolder::_tao_seq_Octet &() const// cast 
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE CORBA::Octet &
+Messaging::ExceptionHolder::_tao_seq_Octet_var::operator[] (CORBA::ULong index)
+{
+  return this->ptr_->operator[] (index);
+}
+
+ACE_INLINE const Messaging::ExceptionHolder::_tao_seq_Octet &
+Messaging::ExceptionHolder::_tao_seq_Octet_var::in (void) const
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE Messaging::ExceptionHolder::_tao_seq_Octet &
+Messaging::ExceptionHolder::_tao_seq_Octet_var::inout (void)
+{
+  return *this->ptr_;
+}
+
+// mapping for variable size 
+ACE_INLINE Messaging::ExceptionHolder::_tao_seq_Octet *&
+Messaging::ExceptionHolder::_tao_seq_Octet_var::out (void)
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+  return this->ptr_;
+}
+
+ACE_INLINE Messaging::ExceptionHolder::_tao_seq_Octet *
+Messaging::ExceptionHolder::_tao_seq_Octet_var::_retn (void)
+{
+  Messaging::ExceptionHolder::_tao_seq_Octet *tmp = this->ptr_;
+  this->ptr_ = 0;
+  return tmp;
+}
+
+ACE_INLINE Messaging::ExceptionHolder::_tao_seq_Octet *
+Messaging::ExceptionHolder::_tao_seq_Octet_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+// *************************************************************
+// Inline operations for class Messaging::ExceptionHolder::_tao_seq_Octet_out
+// *************************************************************
+
+ACE_INLINE
+Messaging::ExceptionHolder::_tao_seq_Octet_out::_tao_seq_Octet_out (Messaging::ExceptionHolder::_tao_seq_Octet *&p)
+  : ptr_ (p)
+{
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+Messaging::ExceptionHolder::_tao_seq_Octet_out::_tao_seq_Octet_out (Messaging::ExceptionHolder::_tao_seq_Octet_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+Messaging::ExceptionHolder::_tao_seq_Octet_out::_tao_seq_Octet_out (const Messaging::ExceptionHolder::_tao_seq_Octet_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (Messaging::ExceptionHolder::_tao_seq_Octet_out&,p).ptr_)
+{}
+
+ACE_INLINE Messaging::ExceptionHolder::_tao_seq_Octet_out &
+Messaging::ExceptionHolder::_tao_seq_Octet_out::operator= (const Messaging::ExceptionHolder::_tao_seq_Octet_out &p)
+{
+  this->ptr_ = ACE_const_cast (Messaging::ExceptionHolder::_tao_seq_Octet_out&,p).ptr_;
+  return *this;
+}
+
+ACE_INLINE Messaging::ExceptionHolder::_tao_seq_Octet_out &
+Messaging::ExceptionHolder::_tao_seq_Octet_out::operator= (Messaging::ExceptionHolder::_tao_seq_Octet *p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+ACE_INLINE 
+Messaging::ExceptionHolder::_tao_seq_Octet_out::operator Messaging::ExceptionHolder::_tao_seq_Octet *&() // cast
+{
+  return this->ptr_;
+}
+
+ACE_INLINE Messaging::ExceptionHolder::_tao_seq_Octet *&
+Messaging::ExceptionHolder::_tao_seq_Octet_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+ACE_INLINE Messaging::ExceptionHolder::_tao_seq_Octet *
+Messaging::ExceptionHolder::_tao_seq_Octet_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE CORBA::Octet &
+Messaging::ExceptionHolder::_tao_seq_Octet_out::operator[] (CORBA::ULong index)
+{
+  return this->ptr_->operator[] (index);
+}
+
+
+
 ACE_INLINE
 Messaging::ExceptionHolder::ExceptionHolder (void) // default constructor
 {}
@@ -3029,16 +3212,13 @@ Messaging::ExceptionHolder::ExceptionHolder (void) // default constructor
 ACE_INLINE
 Messaging::ExceptionHolder::~ExceptionHolder (void) // destructor
 {}
-*/
+
 ACE_INLINE const char* 
 Messaging::ExceptionHolder::_tao_obv_static_repository_id ()
 {
   return "IDL:Messaging/ExceptionHolder:1.0";
 }
 
-#if !defined (_MESSAGING_EXCEPTIONHOLDER___VAR_CI_)
-#define _MESSAGING_EXCEPTIONHOLDER___VAR_CI_
-
 // *************************************************************
 // Inline operations for class Messaging::ExceptionHolder_var
 // *************************************************************
@@ -3146,12 +3326,6 @@ Messaging::ExceptionHolder_var::_retn (void)
 }
 
 
-#endif /* end #if !defined */
-
-
-#if !defined (_MESSAGING_EXCEPTIONHOLDER___OUT_CI_)
-#define _MESSAGING_EXCEPTIONHOLDER___OUT_CI_
-
 // *************************************************************
 // Inline operations for class Messaging::ExceptionHolder_out
 // *************************************************************
@@ -3218,7 +3392,6 @@ Messaging::ExceptionHolder_out::operator-> (void)
 }
 
 
-#endif /* end #if !defined */
 
 // ****************************************************************
 
diff --git a/TAO/tao/Reply_Dispatcher.cpp b/TAO/tao/Reply_Dispatcher.cpp
index fb6f789d476..9374fc70d05 100644
--- a/TAO/tao/Reply_Dispatcher.cpp
+++ b/TAO/tao/Reply_Dispatcher.cpp
@@ -178,20 +178,6 @@ TAO_Asynch_Reply_Dispatcher::dispatch_reply (CORBA::ULong reply_status,
                   "(%P | %t):TAO_Asynch_Reply_Dispatcher::dispatch_reply:\n"));
     }
 
-  // @@ Michael: Addition
-  // Check the reply error.
-
-  // @@Michael: Do this. I think we have to marshal
-  // it in order to be able to handle it as the other exceptions.
-  // if (this->reply_status_ == -1)
-  //      ACE_THROW_RETURN (CORBA::COMM_FAILURE (
-  //        CORBA_SystemException::_tao_minor_code (
-  //          TAO_INVOCATION_RECV_REQUEST_MINOR_CODE,
-  //          errno),
-  //        CORBA::COMPLETED_MAYBE),
-  //      TAO_INVOKE_EXCEPTION);
-
-  // @@ Michael: We need to refine the following.
   CORBA::ULong reply_error = TAO_AMI_REPLY_NOT_OK;
   switch (reply_status)
     {
@@ -222,6 +208,7 @@ TAO_Asynch_Reply_Dispatcher::dispatch_reply (CORBA::ULong reply_status,
                            reply_handler_,
                            reply_error,
                            ACE_TRY_ENV);
+      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {