r2corba 1.5.4 → 1.5.5

data/ext/librpoa/poa.cpp

@@ -11,7 +11,6 @@
 #------------------------------------------------------------------*/
 
 #include "poa.h"
-#include "ace/Auto_Ptr.h"
 #include "tao/DynamicInterface/Server_Request.h"
 #include "tao/DynamicInterface/Dynamic_Implementation.h"
 #include "tao/AnyTypeCode/Any.h"
@@ -25,6 +24,7 @@
 #include "exception.h"
 #include "orb.h"
 #include "servant.h"
+#include <memory>
 
 #define RUBY_INVOKE_FUNC RUBY_ALLOC_FUNC
 
@@ -171,7 +171,7 @@ public:
   R2TAO_POA_BlockedRegionCallerBase ()
     : exception_ (false),
       corba_ex_ (0) {}
-  virtual ~R2TAO_POA_BlockedRegionCallerBase () R2CORBA_NO_EXCEPT_FALSE;
+  virtual ~R2TAO_POA_BlockedRegionCallerBase () noexcept(false);
 
   VALUE call ();
 
@@ -186,13 +186,13 @@ protected:
   CORBA::Exception* corba_ex_;
 };
 
-R2TAO_POA_BlockedRegionCallerBase::~R2TAO_POA_BlockedRegionCallerBase() R2CORBA_NO_EXCEPT_FALSE
+R2TAO_POA_BlockedRegionCallerBase::~R2TAO_POA_BlockedRegionCallerBase() noexcept(false)
 {
   if (this->exception_)
   {
     if (corba_ex_)
     {
-      ACE_Auto_Basic_Ptr<CORBA::Exception> e_ptr(corba_ex_);
+      std::unique_ptr<CORBA::Exception> e_ptr(corba_ex_);
       corba_ex_->_raise ();
     }
     else
@@ -974,7 +974,7 @@ public:
 protected:
   virtual VALUE do_exec ();
 
-  bool wait_for_completion_;
+  bool const wait_for_completion_;
 };
 
 VALUE R2TAO_POAMan_BlockedDiscardReq::do_exec ()
@@ -1015,8 +1015,8 @@ public:
 protected:
   virtual VALUE do_exec ();
 
-  bool etherealize_;
-  bool wait_for_completion_;
+  bool const etherealize_;
+  bool const wait_for_completion_;
 };
 
 VALUE R2TAO_POAMan_BlockedDeactivate::do_exec ()

data/ext/librpoa/servant.cpp

@@ -11,7 +11,6 @@
 #------------------------------------------------------------------*/
 
 #include "poa.h"
-#include "ace/Auto_Ptr.h"
 #include "tao/DynamicInterface/Server_Request.h"
 #include "tao/DynamicInterface/Dynamic_Implementation.h"
 #include "tao/AnyTypeCode/Any.h"
@@ -25,10 +24,7 @@
 #include "exception.h"
 #include "orb.h"
 #include "servant.h"
-
-#if RPOA_NEED_DSI_FIX
-# include "srvreq_fix.cpp"
-#endif
+#include <memory>
 
 #define RUBY_INVOKE_FUNC RUBY_ALLOC_FUNC
 
@@ -113,12 +109,12 @@ void r2tao_init_Servant()
 //===================================================================
 
 struct DSI_Data {
-  R2CORBA_ServerRequest_ptr  _request;
+  CORBA::ServerRequest_ptr  _request;
   CORBA::NVList_ptr _nvlist;
   CORBA::TypeCode_var _result_type;
   VALUE _rData;
 
-  DSI_Data(R2CORBA_ServerRequest_ptr _req)
+  DSI_Data(CORBA::ServerRequest_ptr _req)
     : _request(_req), _nvlist(0), _rData(Qnil) {}
   ~DSI_Data() {
     if (this->_rData!=Qnil) { DATA_PTR(this->_rData) = 0; }
@@ -134,7 +130,7 @@ VALUE r2tao_ServerRequest_operation(VALUE self)
 {
   if (DATA_PTR (self) != 0)
   {
-    R2CORBA_ServerRequest_ptr request = static_cast<DSI_Data*> (DATA_PTR (self))->_request;
+    CORBA::ServerRequest_ptr request = static_cast<DSI_Data*> (DATA_PTR (self))->_request;
     return rb_str_new2 (request->operation ());
   }
   return Qnil;
@@ -152,7 +148,7 @@ VALUE r2tao_ServerRequest_describe(VALUE self, VALUE desc)
       X_CORBA (BAD_INV_ORDER);
     }
 
-    R2CORBA_ServerRequest_ptr request = dsi_data->_request;
+    CORBA::ServerRequest_ptr request = dsi_data->_request;
 
     if (desc != Qnil && rb_type (desc) == T_HASH)
     {
@@ -497,73 +493,6 @@ DSI_Servant::METHOD  DSI_Servant::method_id (const char* method)
   return NONE;
 }
 
-#if RPOA_NEED_DSI_FIX
-void DSI_Servant::invoke (CORBA::ServerRequest_ptr /*request*/)
-{}
-
-void DSI_Servant::_dispatch (TAO_ServerRequest &request,
-                             void * /*context*/)
-{
-  // No need to do any of this if the client isn't waiting.
-  if (request.response_expected ())
-    {
-      if (request.is_forwarded ())
-        {
-          request.init_reply ();
-          request.tao_send_reply ();
-
-          // No need to invoke in this case.
-          return;
-        }
-      else if (request.sync_with_server ())
-        {
-          // The last line before the call to this function
-          // was an ACE_CHECK_RETURN, so if we're here, we
-          // know there is no exception so far, and that's all
-          // a SYNC_WITH_SERVER client request cares about.
-          request.send_no_exception_reply ();
-        }
-    }
-
-  // Create DSI request object.
-  R2CORBA::ServerRequest *dsi_request = 0;
-  ACE_NEW (dsi_request,
-           R2CORBA::ServerRequest (request));
-
-  try
-    {
-      // Delegate to user.
-      this->invoke_fix (dsi_request);
-
-      // Only if the client is waiting.
-      if (request.response_expected () && !request.sync_with_server ())
-        {
-          dsi_request->dsi_marshal ();
-        }
-    }
-  catch (::CORBA::Exception& ex)
-    {
-      // Only if the client is waiting.
-      if (request.response_expected () && !request.sync_with_server ())
-        {
-          if (request.collocated ()
-               && request.operation_details ()->cac () != 0)
-            {
-              // If we have a cac it will handle the exception and no
-              // need to do any further processing
-              request.operation_details ()->cac ()->handle_corba_exception (
-                request, &ex);
-              return;
-            }
-          else
-            request.tao_send_reply_exception (ex);
-        }
-    }
-
-  ::CORBA::release (dsi_request);
-}
-#endif
-
 // invocation helper for threadsafe calling of Ruby code
 void* DSI_Servant::thread_safe_invoke (void * arg)
 {
@@ -581,11 +510,7 @@ void* DSI_Servant::thread_safe_invoke (void * arg)
   return 0;
 }
 
-# if RPOA_NEED_DSI_FIX
-void DSI_Servant::invoke_fix (R2CORBA::ServerRequest_ptr request)
-# else
 void DSI_Servant::invoke (CORBA::ServerRequest_ptr request)
-# endif
 {
   ThreadSafeArg tca_(this, request);
 
@@ -593,12 +518,12 @@ void DSI_Servant::invoke (CORBA::ServerRequest_ptr request)
   if (rc != 0)
   {
     CORBA::SystemException* exc = reinterpret_cast<CORBA::SystemException*> (rc);
-    ACE_Auto_Basic_Ptr<CORBA::SystemException> e_ptr(exc);
+    std::unique_ptr<CORBA::SystemException> e_ptr(exc);
     exc->_raise ();
   }
 }
 
-void DSI_Servant::inner_invoke (R2CORBA_ServerRequest_ptr request)
+void DSI_Servant::inner_invoke (CORBA::ServerRequest_ptr request)
 {
   if (TAO_debug_level > 7)
     ACE_DEBUG ((LM_INFO, "R2TAO (%P|%t) - Servant::invoke(%C)\n", request->operation ()));
@@ -634,7 +559,7 @@ void DSI_Servant::inner_invoke (R2CORBA_ServerRequest_ptr request)
       f = this->_is_a (tmp);
 
       if (TAO_debug_level > 5)
-        ACE_DEBUG ((LM_INFO, "R2TAO (%P|%t) _is_a (%s) -> %d\n", tmp, f));
+        ACE_DEBUG ((LM_INFO, "R2TAO (%P|%t) _is_a (%C) -> %d\n", tmp, f));
     }
     else
     {
@@ -663,7 +588,7 @@ void DSI_Servant::inner_invoke (R2CORBA_ServerRequest_ptr request)
     CORBA::String_var repo_id = this->_repository_id ();
 
     if (TAO_debug_level > 5)
-      ACE_DEBUG ((LM_INFO, "R2TAO (%P|%t) _repository_id () -> %s\n", repo_id.in ()));
+      ACE_DEBUG ((LM_INFO, "R2TAO (%P|%t) _repository_id () -> %C\n", repo_id.in ()));
 
     CORBA::Any _any;
     _any <<= repo_id.in ();
@@ -700,13 +625,13 @@ void DSI_Servant::inner_invoke (R2CORBA_ServerRequest_ptr request)
   }
 }
 
-void DSI_Servant::invoke_DSI (R2CORBA_ServerRequest_ptr request)
+void DSI_Servant::invoke_DSI (CORBA::ServerRequest_ptr request)
 {
   if (TAO_debug_level > 5)
     ACE_DEBUG ((LM_INFO, "R2TAO (%P|%t) - Servant::invoke_DSI(%C) entry\n", request->operation ()));
 
   // wrap request for Ruby; cleanup automatically
-  ACE_Auto_Basic_Ptr<DSI_Data>  dsi_data(new DSI_Data(request));
+  std::unique_ptr<DSI_Data>  dsi_data(new DSI_Data(request));
 
   VALUE srvreq = Data_Wrap_Struct(r2tao_cServerRequest, 0, 0, dsi_data.get ());
 
@@ -752,7 +677,7 @@ void DSI_Servant::invoke_DSI (R2CORBA_ServerRequest_ptr request)
       _exc->completed (
         static_cast<CORBA::CompletionStatus> (NUM2ULONG (rb_iv_get (rexc, "@completed"))));
 
-      ACE_Auto_Basic_Ptr<CORBA::SystemException> e_ptr(_exc);
+      std::unique_ptr<CORBA::SystemException> e_ptr(_exc);
       _exc->_raise ();
     }
     else
@@ -825,7 +750,7 @@ void DSI_Servant::invoke_DSI (R2CORBA_ServerRequest_ptr request)
   }
 }
 
-void DSI_Servant::invoke_SI (R2CORBA_ServerRequest_ptr request)
+void DSI_Servant::invoke_SI (CORBA::ServerRequest_ptr request)
 {
   if (TAO_debug_level > 5)
     ACE_DEBUG ((LM_INFO, "R2TAO (%P|%t) - Servant::invoke_SI(%C) entry\n", request->operation ()));
@@ -985,7 +910,7 @@ void DSI_Servant::invoke_SI (R2CORBA_ServerRequest_ptr request)
         _exc->completed (
           static_cast<CORBA::CompletionStatus> (NUM2ULONG (rb_iv_get (rexc, "@completed"))));
 
-        ACE_Auto_Basic_Ptr<CORBA::SystemException> e_ptr(_exc);
+        std::unique_ptr<CORBA::SystemException> e_ptr(_exc);
         _exc->_raise ();
       }
       else
@@ -1131,7 +1056,7 @@ CORBA::Object_ptr DSI_Servant::_get_component (void)
   }
 }
 
-const char *DSI_Servant::_interface_repository_id (void) const
+const char *DSI_Servant::_interface_repository_id () const
 {
   static R2TAO_RBFuncall FN_repository_id ("_repository_id");
 

data/ext/librpoa/servant.h

@@ -10,36 +10,19 @@
 # Copyright (c) Remedy IT Expertise BV
 #------------------------------------------------------------------*/
 
-#if ((TAO_MAJOR_VERSION < 2) || (TAO_MAJOR_VERSION == 2 && TAO_MINOR_VERSION == 0 && TAO_MICRO_VERSION <= 1))
-# define RPOA_NEED_DSI_FIX  1
-
-# include "srvreq_fix.h"
-
-# define R2CORBA_ServerRequest  R2CORBA::ServerRequest
-# define R2CORBA_ServerRequest_ptr  R2CORBA::ServerRequest_ptr
-#else
-# define R2CORBA_ServerRequest  CORBA::ServerRequest
-# define R2CORBA_ServerRequest_ptr  CORBA::ServerRequest_ptr
-#endif
-
 //-------------------------------------------------------------------
 //  R2TAO Servant class
 //
 //===================================================================
-
 class DSI_Servant : public PortableServer::DynamicImplementation
 {
 public:
+  /// ctor
   DSI_Servant (VALUE rbServant);
-  // ctor
+  /// dtor
   virtual ~DSI_Servant ();
-  // dtor
 
   virtual void invoke (CORBA::ServerRequest_ptr request);
-      //ACE_THROW_SPEC ((CORBA::SystemException));
-#if RPOA_NEED_DSI_FIX
-  void invoke_fix (R2CORBA::ServerRequest_ptr request);
-#endif
 
   virtual CORBA::RepositoryId _primary_interface (
       const PortableServer::ObjectId &oid,
@@ -47,13 +30,13 @@ public:
 
   virtual CORBA::Boolean _is_a (const char *logical_type_id);
 
-  virtual CORBA::Boolean _non_existent (void);
+  virtual CORBA::Boolean _non_existent ();
 
-  //virtual CORBA::InterfaceDef_ptr _get_interface (void);
+  //virtual CORBA::InterfaceDef_ptr _get_interface ();
 
-  virtual CORBA::Object_ptr _get_component (void);
+  virtual CORBA::Object_ptr _get_component ();
 
-  virtual char * _repository_id (void);
+  virtual char * _repository_id ();
 
   enum METHOD {
     NONE,
@@ -73,12 +56,7 @@ public:
   void activate_servant ();
 
 protected:
-  virtual const char *_interface_repository_id (void) const;
-
-#if RPOA_NEED_DSI_FIX
-  /// Turns around and calls invoke.
-  virtual void _dispatch (TAO_ServerRequest &request, void *context);
-#endif
+  virtual const char *_interface_repository_id () const;
 
   void register_with_servant ();
 
@@ -87,26 +65,26 @@ protected:
 
   METHOD  method_id (const char* method);
 
-  virtual void inner_invoke (R2CORBA_ServerRequest_ptr request);
+  void inner_invoke (CORBA::ServerRequest_ptr request);
 
-  void invoke_SI (R2CORBA_ServerRequest_ptr request);
-  void invoke_DSI (R2CORBA_ServerRequest_ptr request);
+  void invoke_SI (CORBA::ServerRequest_ptr request);
+  void invoke_DSI (CORBA::ServerRequest_ptr request);
 
   static VALUE _invoke_implementation(VALUE args);
 
 private:
+  /// The Ruby Servant
   VALUE rbServant_;
-  // The Ruby Servant
 
   CORBA::String_var repo_id_;
 
   struct ThreadSafeArg
   {
     ThreadSafeArg (DSI_Servant* srv,
-                   R2CORBA_ServerRequest_ptr req)
+                   CORBA::ServerRequest_ptr req)
       : servant_(srv), request_(req) {}
     DSI_Servant* servant_;
-    R2CORBA_ServerRequest_ptr request_;
+    CORBA::ServerRequest_ptr request_;
   };
 
   static void* thread_safe_invoke (void * arg);

data/lib/corba/cbase/ORB.rb

@@ -41,12 +41,12 @@ module R2CORBA
           prop = nil
           a1, a2, a3 = args
           if Array === a1
-            raise ArgumentError, "Incorrect nr. of arguments; #{args.size}" if args.size>3
+            raise ArgumentError, "Incorrect nr. of arguments; #{args.size}" if args.size > 3
             argv = a1
             orb_id = (Hash === a2 ? nil : a2)
             prop = (Hash === a2 ? a2 : a3)
           elsif args.size == 1 || Hash === a2
-            raise ArgumentError, "Incorrect nr. of arguments; #{args.size}" if args.size>2
+            raise ArgumentError, "Incorrect nr. of arguments; #{args.size}" if args.size > 2
             orb_id = a1
             prop = a2
           else
@@ -54,7 +54,7 @@ module R2CORBA
           end
           raise ArgumentError, "Invalid argument #{prop.class}; expected Hash" unless prop.nil? || Hash === prop
           unless prop.nil?()
-            prop.inject(argv) {|a,(k,v)| a << k; a << v; a}
+            prop.inject(argv) {|a, (k, v)| a << k; a << v; a}
           end
           @@cached_orb = CORBA::Native::ORB.init(argv.collect {|a| a.to_s }.concat(@@_default_args), orb_id.nil?() ? nil : orb_id.to_s)
         end
@@ -98,11 +98,11 @@ module R2CORBA
         else
           @running ||= true
           raise CORBA::BAD_INV_ORDER.new('ORB has been shutdown', 0, CORBA::COMPLETED_NO) if @shutdown
-          while (timeout.nil? or timeout>0) and !@shutdown
+          while (timeout.nil? or timeout > 0) and !@shutdown
             to = timeout || 0.05
             f, to = self.work_pending(to)
             timeout = to unless timeout.nil?
-            if f and !@shutdown and (timeout.nil? or timeout>0)
+            if f and !@shutdown and (timeout.nil? or timeout > 0)
               to = timeout || 0.05
               to = self.perform_work(to)
               timeout = to unless timeout.nil?
@@ -210,7 +210,7 @@ module R2CORBA
          sigcmd = Signal.trap(signum, 'DEFAULT')
          Signal.trap(signum, sigcmd)
          @@sigreg[signum] = sigcmd
-         if sigcmd.respond_to?(:call) or ['IGNORE','SIG_IGN','EXIT'].include?(sigcmd.to_s)
+         if sigcmd.respond_to?(:call) or ['IGNORE', 'SIG_IGN', 'EXIT'].include?(sigcmd.to_s)
            signum
          else
            nil
@@ -222,7 +222,7 @@ module R2CORBA
      def CORBA.handle_signal(signum)
        if @@sigreg.has_key?(signum)
          if @@sigreg[signum].respond_to?(:call)
-           if @@sigreg[signum].respond_to?(:parameters) && @@sigreg[signum].parameters.size>0
+           if @@sigreg[signum].respond_to?(:parameters) && @@sigreg[signum].parameters.size > 0
              @@sigreg[signum].call(signum)
            else
              @@sigreg[signum].call

data/lib/corba/cbase/Streams.rb

@@ -42,7 +42,7 @@ module R2CORBA
           when TK_DOUBLE
             read_double()
           when TK_LONGDOUBLE
-            raise CORBA::NO_IMPLEMENT.new('LongDouble not supported',0,CORBA::COMPLETED_NO)
+            raise CORBA::NO_IMPLEMENT.new('LongDouble not supported', 0, CORBA::COMPLETED_NO)
           when TK_FIXED
             read_fixed()
           when TK_CHAR
@@ -98,7 +98,7 @@ module R2CORBA
           when TK_DOUBLE
             write_double(value)
           when TK_LONGDOUBLE
-            raise CORBA::NO_IMPLEMENT.new('LongDouble not supported',0,CORBA::COMPLETED_NO)
+            raise CORBA::NO_IMPLEMENT.new('LongDouble not supported', 0, CORBA::COMPLETED_NO)
           when TK_FIXED
             write_fixed(value)
           when TK_CHAR