r2corba 1.5.4 → 1.5.5

data/test/lib/assert.rb

@@ -39,4 +39,3 @@ module TestUtil
   end
 
 end
-

data/test/lib/test.rb

@@ -65,7 +65,7 @@ if defined?(JRUBY_VERSION)
         #                    const char *const *argv,
         #                    const char *const *envp);
 
-        attach_function :_spawnvpe,:_spawnvpe, [:int, :string, :pointer, :pointer], :pointer
+        attach_function :_spawnvpe, :_spawnvpe, [:int, :string, :pointer, :pointer], :pointer
 
         P_NOWAIT = 1
 
@@ -105,7 +105,7 @@ if defined?(JRUBY_VERSION)
         def self.wait(pid)
           stat_ptr = FFI::MemoryPointer.new(:int, 1)
           tmp_pid = _wait(stat_ptr, pid, 0)
-          if tmp_pid==pid
+          if tmp_pid == pid
             return [pid, stat_ptr.get_int()]
           else
             return [pid, 0]
@@ -120,7 +120,7 @@ if defined?(JRUBY_VERSION)
           args_ary.put_array_of_pointer(0, str_ptrs)
 
           env_ary = FFI::MemoryPointer.new(:pointer, ENV.length + 1)
-          env_ptrs = ENV.map {|key,value| FFI::MemoryPointer.from_string("#{key}=#{value}")}
+          env_ptrs = ENV.map {|key, value| FFI::MemoryPointer.from_string("#{key}=#{value}")}
           env_ary.put_array_of_pointer(0, env_ptrs)
 
           [P_NOWAIT, args[0], args_ary, env_ary]
@@ -159,7 +159,7 @@ if defined?(JRUBY_VERSION)
         def self.wait(pid)
           begin
             tmp, status = ::Process.waitpid2(pid, ::Process::WNOHANG)
-            if tmp==pid and status.success? != nil
+            if tmp == pid and status.success? != nil
               return [pid, status.success?() ? 0 : status.exitstatus ]
             end
             return [nil, 0]
@@ -178,7 +178,7 @@ if defined?(JRUBY_VERSION)
           args_ary.put_array_of_pointer(0, str_ptrs)
 
           env_ary = FFI::MemoryPointer.new(:pointer, ENV.length + 1)
-          env_ptrs = ENV.map {|key,value| FFI::MemoryPointer.from_string("#{key}=#{value}")}
+          env_ptrs = ENV.map {|key, value| FFI::MemoryPointer.from_string("#{key}=#{value}")}
           env_ary.put_array_of_pointer(0, env_ptrs)
 
           [pid_ptr, args[0], nil, nil, args_ary, env_ary]
@@ -197,7 +197,7 @@ if defined?(JRUBY_VERSION)
             sleep 0.01
 
             tmp_pid, tmp_status = Exec.wait(@pid)
-            if tmp_pid==@pid
+            if tmp_pid == @pid
               exit_status = tmp_status
               is_running = false
             end
@@ -237,7 +237,7 @@ if defined?(JRUBY_VERSION)
     end
 
     def is_running?; @exitstatus.nil?; end
-    def has_error? ; @trd.status.nil? or (!self.is_running? and self.exitstatus!=0) ;end
+    def has_error? ; @trd.status.nil? or (!self.is_running? and self.exitstatus != 0) ;end
 
     def stop
       Exec.stop(@pid)
@@ -287,9 +287,9 @@ elsif is_win32? && TestUtil::RBVersion[0] < 2 && TestUtil::RBVersion[1] < 9
       extend WinAPI
 
       def Process.create(cmd_)
-        startinfo = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
+        startinfo = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
         startinfo = startinfo.pack('LLLLLLLLLLLLSSLLLL')
-        procinfo  = [0,0,0,0].pack('LLLL')
+        procinfo  = [0, 0, 0, 0].pack('LLLL')
 
         bool = CreateProcess(
            0,                 # App name
@@ -309,10 +309,10 @@ elsif is_win32? && TestUtil::RBVersion[0] < 2 && TestUtil::RBVersion[1] < 9
         end
 
         ProcessInfo.new(
-           procinfo[0,4].unpack('L').first, # hProcess
-           procinfo[4,4].unpack('L').first, # hThread
-           procinfo[8,4].unpack('L').first, # hProcessId
-           procinfo[12,4].unpack('L').first # hThreadId
+           procinfo[0, 4].unpack('L').first, # hProcess
+           procinfo[4, 4].unpack('L').first, # hThread
+           procinfo[8, 4].unpack('L').first, # hProcessId
+           procinfo[12, 4].unpack('L').first # hThreadId
         )
       end
 
@@ -441,7 +441,7 @@ else # !win32
     def check_status
       begin
         tmp, @status = ::Process.waitpid2(@pid, ::Process::WNOHANG)
-        if tmp==@pid and @status.success? == false
+        if tmp == @pid and @status.success? == false
           @exitstatus = @status.exitstatus
           return false
         end
@@ -538,4 +538,3 @@ end
   end
 
 end
-

data/test/test_runner.rb

@@ -49,23 +49,23 @@ else
   ENV['RUBYLIB'] = incdirs.join(File::PATH_SEPARATOR)
   if is_win32
     ENV['PATH'] = [
-      File.directory?(ace_root) ? File.join(ENV['ACE_ROOT'],'lib') : nil,
+      File.directory?(ace_root) ? File.join(ENV['ACE_ROOT'], 'lib') : nil,
       File.expand_path(File.join(root_path, 'ext')),
       ENV['PATH']
       ].compact.join(File::PATH_SEPARATOR)
   elsif RUBY_PLATFORM =~ /darwin/
       ENV['DYLD_LIBRARY_PATH'] = [
-          File.directory?(ace_root) ? File.join(ENV['ACE_ROOT'],'lib') : nil,
+          File.directory?(ace_root) ? File.join(ENV['ACE_ROOT'], 'lib') : nil,
           ENV['DYLD_LIBRARY_PATH']
         ].compact.join(File::PATH_SEPARATOR)
       ENV['DYLD_FALLBACK_LIBRARY_PATH'] = [
-          File.directory?(ace_root) ? File.join(ENV['ACE_ROOT'],'lib') : nil,
+          File.directory?(ace_root) ? File.join(ENV['ACE_ROOT'], 'lib') : nil,
           File.expand_path(File.join(root_path, 'ext')),
           ENV['DYLD_FALLBACK_LIBRARY_PATH']
         ].compact.join(File::PATH_SEPARATOR)
   else
     ENV['LD_LIBRARY_PATH'] = [
-        File.directory?(ace_root) ? File.join(ENV['ACE_ROOT'],'lib') : nil,
+        File.directory?(ace_root) ? File.join(ENV['ACE_ROOT'], 'lib') : nil,
         ENV['LD_LIBRARY_PATH']
       ].compact.join(File::PATH_SEPARATOR)
   end
@@ -184,9 +184,8 @@ module TestFinder
 end
 
 # add Ruby library path for test library
-ENV['RUBYLIB'] = ((ENV['RUBYLIB'] || '').split(File::PATH_SEPARATOR)+[TestFinder::ROOT]).join(File::PATH_SEPARATOR)
+ENV['RUBYLIB'] = ((ENV['RUBYLIB'] || '').split(File::PATH_SEPARATOR) + [TestFinder::ROOT]).join(File::PATH_SEPARATOR)
 
 if $0 == __FILE__
   TestFinder.run(ARGV)
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: r2corba
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
 platform: ruby
 authors:
 - Martin Corino
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-25 00:00:00.000000000 Z
+date: 2021-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ridl
@@ -29,14 +29,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 12.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 12.3.3
 description: 'OMG CORBA v3.3 compliant CORBA language mapping implementation for Ruby.
@@ -82,8 +82,6 @@ files:
 - ext/librpoa/rpoa_export.h
 - ext/librpoa/servant.cpp
 - ext/librpoa/servant.h
-- ext/librpoa/srvreq_fix.cpp
-- ext/librpoa/srvreq_fix.h
 - ext/librpol/policies.cpp
 - ext/librpol/policies.h
 - ext/librpol/rpol_export.h

data/ext/librpoa/srvreq_fix.cpp

@@ -1,282 +0,0 @@
-/*--------------------------------------------------------------------
-# srvreq_fix.h - R2TAO CORBA Servant support
-#
-# Author: Martin Corino
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the R2CORBA LICENSE which is
-# included with this program.
-#
-# Copyright (c) Remedy IT Expertise BV
-#------------------------------------------------------------------*/
-
-#ifndef __SRVREQ_FIX_CPP__
-#define __SRVREQ_FIX_CPP__
-
-#include "tao/DynamicInterface/DII_Arguments.h"
-#include "tao/DynamicInterface/Unknown_User_Exception.h"
-#include "tao/PortableServer/Collocated_Arguments_Converter.h"
-#include "tao/AnyTypeCode/NVList.h"
-#include "tao/GIOP_Utils.h"
-#include "tao/AnyTypeCode/Marshal.h"
-#include "tao/AnyTypeCode/TypeCode.h"
-#include "tao/AnyTypeCode/Any_Impl.h"
-#include "tao/operation_details.h"
-#include "tao/SystemException.h"
-
-// Reference counting for DSI ServerRequest object.
-
-CORBA::ULong
-R2CORBA::ServerRequest::_incr_refcount (void)
-{
-  return ++this->refcount_;
-}
-
-CORBA::ULong
-R2CORBA::ServerRequest::_decr_refcount (void)
-{
-  CORBA::ULong const new_count = --this->refcount_;
-
-  if (new_count == 0)
-    delete this;
-
-  return new_count;
-}
-
-R2CORBA::ServerRequest::ServerRequest (TAO_ServerRequest &orb_server_request)
-  : lazy_evaluation_ (0),
-    ctx_ (CORBA::Context::_nil ()),
-    params_ (CORBA::NVList::_nil ()),
-    retval_ (0),
-    exception_ (0),
-    refcount_ (1),
-    orb_server_request_ (orb_server_request),
-    sent_gateway_exception_ (false)
-{
-  this->orb_server_request_.is_dsi ();
-}
-
-R2CORBA::ServerRequest::~ServerRequest (void)
-{
-  if (this->params_ != 0)
-    {
-      ::CORBA::release (this->params_);
-    }
-
-  delete this->retval_;
-  delete this->exception_;
-}
-
-// Unmarshal in/inout params, and set up to marshal the appropriate
-// inout/out/return values later on.
-void
-R2CORBA::ServerRequest::arguments (CORBA::NVList_ptr &list)
-{
-  // arguments() must be called before either of these.
-  if (this->params_ != 0 || this->exception_ != 0)
-    {
-      throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 7, CORBA::COMPLETED_NO);
-    }
-
-  // In a collocated situation there will not be an incoming CDR stream
-  // in which case we can get the arguments from the
-  // operation_details using the 'collocated argument converter'.
-  if (this->orb_server_request_.collocated ())
-  {
-    this->params_ = list;
-
-    if (this->orb_server_request_.operation_details ()->cac () != 0)
-      {
-        TAO_OutputCDR output;
-        this->orb_server_request_.operation_details ()->cac (
-                )->dsi_convert_request (this->orb_server_request_,
-                                        output);
-
-        TAO_InputCDR input(output);
-        this->params_->_tao_decode (input, CORBA::ARG_IN | CORBA::ARG_INOUT);
-      }
-  }
-  else
-  {
-    // Save params for later use when marshaling the reply.
-    this->params_ = list;
-
-    // sometimes there is no incoming stream
-    if (this->orb_server_request_.incoming ())
-    {
-      this->params_->_tao_incoming_cdr (*this->orb_server_request_.incoming (),
-                                        CORBA::ARG_IN | CORBA::ARG_INOUT,
-                                        this->lazy_evaluation_);
-
-      // Pass this alignment back to the TAO_ServerRequest.
-      this->orb_server_request_.dsi_nvlist_align (
-                                    this->params_->_tao_target_alignment ());
-    }
-  }
-}
-
-// Store the result value.  There's either an exception, or a result,
-// but not both of them.  Results can be reported (at most once)
-// only after the parameter list has been provided (maybe empty).
-void
-R2CORBA::ServerRequest::set_result (const CORBA::Any &value
-                                  )
-{
-  // Setting a result when another result already exists or if an exception
-  // exists or before the args have been processeed is an error.
-  if (this->retval_ != 0 || this->exception_ != 0 || this->params_ == 0)
-    {
-      throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 8, CORBA::COMPLETED_NO);
-    }
-
-  ACE_NEW_THROW_EX (this->retval_,
-                    CORBA::Any (value),
-                    CORBA::NO_MEMORY ());
-}
-
-  // NOTE: if "" is set, there has been a system exception,
-  // and it will take precedence over exceptions reported using the
-  // set_exception() mechanism of the ServerRequest, which we assume
-  // the application writer will use to report only user exceptions.
-  // If both types of exception happen on the same invocation, the user
-  // exception will be lost.
-
-// Store the exception value.
-void
-R2CORBA::ServerRequest::set_exception (const CORBA::Any &value)
-{
-  CORBA::TypeCode_var tc = value.type ();
-
-  CORBA::TCKind const kind = tc->kind ();
-
-  // set_exception() can be called at any time, but the Any arg MUST
-  // contain an exception.
-  if (kind != CORBA::tk_except)
-    {
-      throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 21, CORBA::COMPLETED_MAYBE);
-    }
-
-  ACE_NEW_THROW_EX (this->exception_,
-                    CORBA::Any (value),
-                    CORBA::NO_MEMORY ());
-
-  this->orb_server_request_.reply_status (GIOP::USER_EXCEPTION);
-}
-
-// This method will be utilized by the DSI servant to marshal outgoing
-// parameters.
-void
-R2CORBA::ServerRequest::dsi_marshal (void)
-{
-  // There was a user exception, no need to marshal any parameters.
-  if (this->sent_gateway_exception_)
-    {
-      return;
-    }
-
-  // In a collocated situation there is no outgoing CDR stream.
-  // So, in case of an exception we just raise the UnknownUserException
-  // and for a regular reply we use the 'collocated argument converter'.
-  if (this->orb_server_request_.collocated ())
-  {
-    if (this->orb_server_request_.reply_status () == GIOP::USER_EXCEPTION)
-      {
-        throw CORBA::UnknownUserException (*this->exception_);
-      }
-    else if (this->orb_server_request_.operation_details ()->cac () != 0)
-      {
-        TAO_OutputCDR output;
-        // marshal the return value if any
-        if (this->retval_ != 0)
-          {
-            this->retval_->impl ()->marshal_value (output);
-          }
-
-        // marshal the "inout" and "out" parameters.
-        if (this->params_ != 0)
-          {
-            this->params_->_tao_encode (
-                              output,
-                              CORBA::ARG_INOUT | CORBA::ARG_OUT);
-          }
-
-        TAO_InputCDR input (output);
-        // set reply parameters
-        this->orb_server_request_.operation_details ()->cac (
-                )->dsi_convert_reply (this->orb_server_request_,
-                                      input);
-      }
-  }
-  else
-  {
-    if (this->orb_server_request_.reply_status () == GIOP::NO_EXCEPTION)
-      {
-        // In DSI, we can't rely on the skeleton to do this.
-        if (this->retval_ == 0 && this->params_ == 0)
-          {
-          this->orb_server_request_.argument_flag (false);
-          }
-
-        this->orb_server_request_.init_reply ();
-
-        // Send the return value, if any.
-        if (this->retval_ != 0)
-          {
-            this->retval_->impl ()->marshal_value (
-                                        *this->orb_server_request_.outgoing ());
-          }
-
-        // Send the "inout" and "out" parameters.
-        if (this->params_ != 0)
-          {
-            this->params_->_tao_encode (
-                              *this->orb_server_request_.outgoing (),
-                              CORBA::ARG_INOUT | CORBA::ARG_OUT);
-          }
-      }
-    else
-      {
-      // This defaults to true, but just to be safe...
-      this->orb_server_request_.argument_flag (true);
-
-        // Write the reply header to the ORB request's outgoing CDR stream.
-        this->orb_server_request_.init_reply ();
-
-        this->exception_->impl ()->marshal_value (
-                                      *this->orb_server_request_.outgoing ());
-      }
-  }
-
-  // do not send in case of deferred reply
-  if (!this->orb_server_request_.deferred_reply ())
-  {
-    this->orb_server_request_.tao_send_reply ();
-  }
-}
-
-void
-R2CORBA::ServerRequest::gateway_exception_reply (ACE_CString &raw_exception)
-{
-  // This defaults to 1, but just to be safe...
-  this->orb_server_request_.argument_flag (true);
-
-  // This reply path handles only user exceptions.
-  this->orb_server_request_.reply_status (GIOP::USER_EXCEPTION);
-
-  this->orb_server_request_.init_reply ();
-
-  // We know nothing about this exception, so we marshal it as a block
-  // of bytes. The outgoing stream's byte order has already been matched
-  // to the original source of the reply.
-  this->orb_server_request_.outgoing ()->write_octet_array (
-      reinterpret_cast<const CORBA::Octet *> (raw_exception.fast_rep ()),
-      static_cast<CORBA::ULong> (raw_exception.length () + ACE_CDR::MAX_ALIGNMENT)
-    );
-
-  // This will prevent the marshaling of any parameters into this reply.
-  this->sent_gateway_exception_ = true;
-
-  this->orb_server_request_.tao_send_reply ();
-}
-
-#endif