diff options
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 18 | ||||
| -rw-r--r-- | TAO/docs/ORBEndpoint.html | 18 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/Exception.cpp | 24 | ||||
| -rw-r--r-- | TAO/tao/Exception.h | 7 |
5 files changed, 44 insertions, 27 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index b70a865e3ec..3bf55e87145 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,21 @@ +Tue Oct 10 08:50:07 2000 Ossama Othman <ossama@uci.edu> + + * tao/Exception.h: + * tao/Exception.cpp: + + Reverted changes that remove <ace/SString.h> header dependency. + They introduced a memory access violation. To be revisted in + the near future. + + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp (create_rt_mprofile): + + Corrected typo that prevented SSLIOP::SSL tagged component from + being embedded in current profile. + + * docs/ORBEndpoint.html: + + Corrected SHMIOP endpoint syntax. + Tue Oct 10 16:59:18 2000 Nanbor Wang <nanbor@cs.wustl.edu> * TAOACE_Static.dsw: Updated some project dependencies. diff --git a/TAO/docs/ORBEndpoint.html b/TAO/docs/ORBEndpoint.html index a39dbb1e302..32429ebff1f 100644 --- a/TAO/docs/ORBEndpoint.html +++ b/TAO/docs/ORBEndpoint.html @@ -302,7 +302,7 @@ <BLOCKQUOTE> <P> <CODE> - -ORBEndpoint shmiop://V.v@:port1,...,W.w@:port2 + -ORBEndpoint shmiop://V.v@port1,...,W.w@port2 </CODE> </BLOCKQUOTE> <P> @@ -319,7 +319,7 @@ <BLOCKQUOTE> <P> <CODE> - -ORBEndpoint shmiop://:port/priority=50 + -ORBEndpoint shmiop://port/priority=50 </CODE> </BLOCKQUOTE> <P> @@ -353,14 +353,14 @@ <P> Here are some additional examples of SHMIOP endoints: <UL> - <LI><CODE>-ORBEndpoint shmiop://1.0@:0</CODE> - <LI><CODE>-ORBEndpoint shmiop://1.0@:0,:3456</CODE> - <LI><CODE>-ORBEndpoint shmiop://1.0@:0,:3456/priority=300</CODE></LI> + <LI><CODE>-ORBEndpoint shmiop://1.0@0</CODE> + <LI><CODE>-ORBEndpoint shmiop://1.0@0,3456</CODE> + <LI><CODE>-ORBEndpoint shmiop://1.0@0,3456/priority=300</CODE></LI> <LI><CODE>-ORBEndpoint shmiop:///priority=2</CODE> <FONT COLOR=RED>(notice three slashes "<CODE>///</CODE>")</FONT> - <LI><CODE>-ORBEndpoint shmiop://:2020/priority=12345</CODE> + <LI><CODE>-ORBEndpoint shmiop://2020/priority=12345</CODE> <LI><CODE>-ORBEndpoint shmiop://1.1@</CODE> - <LI><CODE>-ORBEndpoint shmiop://1.1@:1234</CODE> - <LI><CODE>-ORBEndpoint shmiop://1.1@,1.0@:1234,1.1@</CODE> + <LI><CODE>-ORBEndpoint shmiop://1.1@1234</CODE> + <LI><CODE>-ORBEndpoint shmiop://1.1@,1.0@1234,1.1@</CODE> </UL> <hr> @@ -467,7 +467,7 @@ <address><a href="mailto:ossama@uci.edu">Ossama Othman</a></address> <!-- Created: Thu May 18 08:37:25 PDT 2000 --> <!-- hhmts start --> -Last modified: Mon Jun 26 12:44:25 PDT 2000 +Last modified: Thu Oct 5 14:25:05 PDT 2000 <!-- hhmts end --> </body> </html> diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp index 2128df67aa5..38d7a9daef5 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp @@ -161,7 +161,7 @@ TAO_SSLIOP_Acceptor::create_mprofile (const TAO_ObjectKey &object_key, // IOR, i.e. secure invocation policies on a per-object // basis, rather than on a per-endpoint basis. If no secure // invocation policies have been set then we should use the - // below default SSLIOP::SSL component. + // below default SSLIOP::SSL component. cdr << this->ssl_component_; // TAO extension, replace the contents of the octet sequence with @@ -235,7 +235,7 @@ TAO_SSLIOP_Acceptor::create_rt_mprofile (const TAO_ObjectKey &object_key, return -1; } - if (this->orb_core_->orb_params ()->std_profile_components () == 0) + if (this->orb_core_->orb_params ()->std_profile_components () != 0) { ssliop_profile->tagged_components ().set_orb_type (TAO_ORB_TYPE); diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp index 72310b7ae20..d42c57ec477 100644 --- a/TAO/tao/Exception.cpp +++ b/TAO/tao/Exception.cpp @@ -4,7 +4,6 @@ // on all of these data structures. #include "ace/streams.h" -#include "ace/SString.h" #include "tao/Exception.h" #include "tao/Typecode.h" #include "tao/Environment.h" @@ -105,10 +104,10 @@ CORBA_Exception::_tao_print_exception (const char *user_provided_info, ACE_TEXT ("(%P|%t) EXCEPTION, %s\n") ACE_TEXT ("%s\n"), user_provided_info, - this->_info ())); + this->_info ().c_str ())); } -const char * +ACE_CString CORBA_Exception::_info (void) const { CORBA::SystemException *system_exception = @@ -124,7 +123,7 @@ CORBA_Exception::_info (void) const ACE_CString user_exception_info = "user exception, ID '"; user_exception_info += this->_id (); user_exception_info += "'"; - return user_exception_info.c_str (); + return user_exception_info; } void @@ -378,10 +377,10 @@ CORBA_SystemException::_tao_print_system_exception (FILE *) const { ACE_DEBUG ((LM_ERROR, ACE_TEXT ("(%P|%t) system exception, ID '%s'\n"), - this->_info ())); + this->_info ().c_str ())); } -const char * +ACE_CString CORBA_SystemException::_info (void) const { // @@ there are a other few "user exceptions" in the CORBA scope, @@ -569,7 +568,7 @@ CORBA_SystemException::_info (void) const break; default: break; - // @@ We should add all the standard minor codes from + // @@ We should add all the standard minor codes from } } /* else if (this->is_a ("IDL:omg.org/CORBA/....")) */ @@ -585,7 +584,7 @@ CORBA_SystemException::_info (void) const (completed () == CORBA::COMPLETED_NO) ? "NO" : (completed () == CORBA::COMPLETED_MAYBE) ? "MAYBE" : "garbage"); - + info += buffer; } else @@ -604,7 +603,7 @@ CORBA_SystemException::_info (void) const info += buffer; } - return info.c_str (); + return info; } CORBA_UnknownUserException::CORBA_UnknownUserException (void) @@ -970,8 +969,9 @@ TAO_Exceptions::fini (void) int \ CORBA_##name ::_is_a (const char* interface_id) const \ { \ - return ((ACE_OS_String::strcmp (interface_id, \ - "IDL:omg.org/CORBA/" #name ":1.0") == 0) \ + return ((ACE_OS_String::strcmp ( \ + interface_id, \ + "IDL:omg.org/CORBA/" #name ":1.0") == 0) \ || CORBA_SystemException::_is_a (interface_id)); \ } STANDARD_EXCEPTION_LIST @@ -1112,7 +1112,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &any, \ if (!(stream >> interface_repository_id.out ())) \ return 0; \ if (ACE_OS_String::strcmp (interface_repository_id.in (), \ - "IDL:omg.org/CORBA/" #name ":1.0")) \ + "IDL:omg.org/CORBA/" #name ":1.0")) \ return 0; \ tmp->_tao_decode (stream, ACE_TRY_ENV); \ ACE_TRY_CHECK; \ diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h index ae69663beeb..6e4ff709879 100644 --- a/TAO/tao/Exception.h +++ b/TAO/tao/Exception.h @@ -1,5 +1,4 @@ // This may look like C, but it's really -*- C++ -*- -// // $Id$ // ============================================================================ @@ -28,6 +27,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/SString.h" // This is used in the implementation of the _raise methods #if defined (TAO_HAS_EXCEPTIONS) @@ -36,7 +36,6 @@ #define TAO_RAISE(EXCEPTION) #endif /* TAO_HAS_EXCEPTIONS */ - class CORBA_Any; class TAO_OutputCDR; class TAO_InputCDR; @@ -88,7 +87,7 @@ public: // Print the exception <ex> to output determined by <f>. This // function is not CORBA compliant. - const char *_info (void) const; + ACE_CString _info (void) const; // Returns a string containing information about the exception. This // function is not CORBA compliant. @@ -210,7 +209,7 @@ public: // Print the system exception <ex> to output determined by f. This // function is not CORBA compliant. - const char *_info (void) const; + ACE_CString _info (void) const; // Returns a string containing information about the exception. This // function is not CORBA compliant. |