r2corba 1.5.2 → 1.6.0

data/lib/corba/common/Union.rb

@@ -19,16 +19,20 @@ module R2CORBA
           @discriminator = nil
           @value = nil
         end
+
         def _is_at_default?
           @discriminator == :default
         end
+
         def _value_tc
           ix = self.class._tc.label_index(@discriminator)
           self.class._tc.member_type(ix)
         end
+
         def _disc
           @discriminator
         end
+
         def _disc=(val)
           m_cur = self.class._tc.label_member(@discriminator) unless @discriminator.nil?
           m_new = self.class._tc.label_member(val)
@@ -39,6 +43,7 @@ module R2CORBA
           @discriminator = val
           disc_
         end
+
         def _value
           @value
         end

data/lib/corba/common/Values.rb

@@ -42,6 +42,7 @@ module R2CORBA
         def marshal(os)
           raise CORBA::NO_IMPLEMENT
         end
+
         def unmarshal(is)
           raise CORBA::NO_IMPLEMENT
         end

data/lib/corba/common/const.rb

@@ -11,8 +11,8 @@
 #--------------------------------------------------------------------
 module R2CORBA
   module CORBA
-    BIG_ENDIAN, LTL_ENDIAN = 0,1
-    ENDIAN = ("Ruby".unpack("i")[0] == 2036495698)? LTL_ENDIAN: BIG_ENDIAN
+    BIG_ENDIAN, LTL_ENDIAN = 0, 1
+    ENDIAN = ('Ruby'.unpack('i')[0] == 2036495698) ? LTL_ENDIAN : BIG_ENDIAN
 
     ARG_IN = 1
     ARG_OUT = 2

data/lib/corba/common/exception.rb

@@ -13,7 +13,7 @@
 module R2CORBA
   module CORBA
     COMPLETED_YES, COMPLETED_NO, COMPLETED_MAYBE = (0..2).to_a
-    COMPLETED_TXT = ["YES", "NO", "MAYBE"].freeze
+    COMPLETED_TXT = ['YES', 'NO', 'MAYBE'].freeze
     class Exception < StandardError
     end
 
@@ -29,6 +29,7 @@ module R2CORBA
       def reason
         self.message
       end
+
       def to_s
         "CORBA::#{self.class::Name}(#{super}) [minor=#{@minor};completed=#{COMPLETED_TXT[@completed.to_i]}]"
       end

data/lib/corba/common/require.rb

@@ -10,6 +10,14 @@
 # Copyright (c) Remedy IT Expertise BV
 #--------------------------------------------------------------------
 
+module R2CORBA
+
+  # from Ruby 2.4 Fixnum and Bignum are deprecated
+  FIXNUM_KLASS = (1.class == ::Integer ? ::Integer : ::Fixnum)
+  BIGNUM_KLASS = (1.class == ::Integer ? ::Integer : ::Bignum)
+
+end
+
 [ 'version',
   'const',
   'IDL',

data/lib/corba/common/version.rb

@@ -13,8 +13,8 @@
 module R2CORBA
 
   R2CORBA_MAJOR = 1
-  R2CORBA_MINOR = 5
-  R2CORBA_RELEASE = 2
+  R2CORBA_MINOR = 6
+  R2CORBA_RELEASE = 0
 
   R2CORBA_VERSION = "#{R2CORBA_MAJOR}.#{R2CORBA_MINOR}.#{R2CORBA_RELEASE}".freeze
 

data/lib/corba/idl/IDL.rb

@@ -12,7 +12,7 @@
 module R2CORBA
 
   module CORBA
-    def CORBA.implement(idlfile, params={}, genbits = IDL::CLIENT_STUB, &block)
+    def CORBA.implement(idlfile, params = {}, genbits = IDL::CLIENT_STUB, &block)
       IDL.implement(idlfile, params, genbits, &block)
     end
   end

data/lib/corba/jbase/Any.rb

@@ -15,21 +15,23 @@ module R2CORBA
       module Dynamic
         include_package 'org.omg.DynamicAny'
       end
+
       module Reflect
         java_import java.lang.reflect.Array
       end
     end
+
     class Any
-      def to_java(jorb=nil,jany=nil)
+      def to_java(jorb = nil, jany = nil)
         rtc = self._tc
         rval = self._value.nil? ? self._value : rtc.validate(self._value)
         restc = rtc.resolved_tc
         begin
           if [TK_VALUE, TK_VALUE_BOX, TK_ABSTRACT_INTERFACE].include?(restc.kind) ||
-             (!rval.nil? && [TK_NULL,TK_ANY,TK_BOOLEAN,TK_SHORT,TK_LONG,TK_USHORT,
-                            TK_WCHAR,TK_ULONG,TK_LONGLONG,TK_ULONGLONG,TK_OCTET,
-                            TK_FLOAT,TK_DOUBLE,TK_LONGDOUBLE,TK_CHAR,TK_STRING,TK_WSTRING,
-                            TK_VALUE, TK_VALUE_BOX,TK_TYPECODE,TK_OBJREF,TK_PRINCIPAL].include?(restc.kind))
+             (!rval.nil? && [TK_NULL, TK_ANY, TK_BOOLEAN, TK_SHORT, TK_LONG, TK_USHORT,
+                            TK_WCHAR, TK_ULONG, TK_LONGLONG, TK_ULONGLONG, TK_OCTET,
+                            TK_FLOAT, TK_DOUBLE, TK_LONGDOUBLE, TK_CHAR, TK_STRING, TK_WSTRING,
+                            TK_VALUE, TK_VALUE_BOX, TK_TYPECODE, TK_OBJREF, TK_PRINCIPAL].include?(restc.kind))
             jorb ||= CORBA::ORB._orb
             jany ||= jorb.create_any()
             case restc.kind
@@ -60,7 +62,7 @@ module R2CORBA
             when TK_DOUBLE
               jany.insert_double(rval)
             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
               jany.insert_fixed(java.math.BigDecimal.new(rval.to_s))
             when TK_CHAR
@@ -68,7 +70,7 @@ module R2CORBA
             when TK_STRING
               jany.insert_string(rval)
             when TK_WSTRING
-              jany.insert_wstring(rval.inject('') {|s,b| s << b.chr})
+              jany.insert_wstring(rval.inject('') {|s, b| s << b.chr})
             when TK_VALUE
               jany.insert_Value(rval, rtc.tc_)
             when TK_VALUE_BOX
@@ -94,15 +96,15 @@ module R2CORBA
                 jany.insert_Value(rval, rtc.tc_)
               end
             when TK_PRINCIPAL
-              raise CORBA::NO_IMPLEMENT.new('Principal not supported',0,CORBA::COMPLETED_NO)
+              raise CORBA::NO_IMPLEMENT.new('Principal not supported', 0, CORBA::COMPLETED_NO)
             ## TODO: TK_NATIVE
             else
-              raise CORBA::MARSHAL.new("unknown kind [#{rtc.kind}]",0,CORBA::COMPLETED_NO)
+              raise CORBA::MARSHAL.new("unknown kind [#{rtc.kind}]", 0, CORBA::COMPLETED_NO)
             end
             return jany
           else
             dynFactory = CORBA::Native::Dynamic::DynAnyFactoryHelper.narrow(
-                          (jorb || CORBA::ORB._orb).resolve_initial_references("DynAnyFactory"))
+                          (jorb || CORBA::ORB._orb).resolve_initial_references('DynAnyFactory'))
             jdynany = dynFactory.create_dyn_any_from_type_code(rtc.tc_)
             begin
               unless rval.nil?
@@ -112,15 +114,15 @@ module R2CORBA
                   jdynany.set_as_ulong(rval)
                 when TK_ARRAY
                   jelems = CORBA::Native::Reflect::Array.newInstance(CORBA::Native::Any.java_class, rval.size)
-                  rval.each_with_index {|e,i| jelems[i] = Any.to_any(e, restc.content_type).to_java(jorb) }
+                  rval.each_with_index {|e, i| jelems[i] = Any.to_any(e, restc.content_type).to_java(jorb) }
                   jdynany.set_elements(jelems)
                 when TK_SEQUENCE
                   jelems = CORBA::Native::Reflect::Array.newInstance(CORBA::Native::Any.java_class, rval.size)
-                  rval.each_with_index {|e,i| jelems[i] = Any.to_any(e, restc.content_type).to_java(jorb) }
+                  rval.each_with_index {|e, i| jelems[i] = Any.to_any(e, restc.content_type).to_java(jorb) }
                   jdynany.set_elements(jelems)
                 when TK_STRUCT, TK_EXCEPT
                   jmembers = CORBA::Native::Reflect::Array.newInstance(CORBA::Native::Dynamic::NameValuePair.java_class, restc.members.size)
-                  rtc.members.each_with_index {|(mn, mt),i| jmembers[i] = CORBA::Native::Dynamic::NameValuePair.new(mn, Any.to_any(rval.__send__(mn.intern), mt).to_java(jorb)) }
+                  rtc.members.each_with_index {|(mn, mt), i| jmembers[i] = CORBA::Native::Dynamic::NameValuePair.new(mn, Any.to_any(rval.__send__(mn.intern), mt).to_java(jorb)) }
                   jdynany.set_members(jmembers)
                 when TK_UNION
                   if rval._is_at_default?
@@ -134,7 +136,7 @@ module R2CORBA
                     jdynany.member.from_any(Any.to_any(rval._value, rval._value_tc).to_java(jorb))
                   end
                 else
-                  raise CORBA::MARSHAL.new("unknown kind [#{rtc.kind}]",0,CORBA::COMPLETED_NO)
+                  raise CORBA::MARSHAL.new("unknown kind [#{rtc.kind}]", 0, CORBA::COMPLETED_NO)
                 end
               end
               if jany.nil?
@@ -152,15 +154,15 @@ module R2CORBA
         end
       end # to_java
 
-      def Any.from_java(jany, jorb=nil, rtc=nil)
+      def Any.from_java(jany, jorb = nil, rtc = nil)
         rtc ||= CORBA::TypeCode.from_native(jany.type)
         rval = nil
         begin
-          if [TK_NULL,TK_VOID,TK_ANY,TK_BOOLEAN,TK_SHORT,TK_LONG,TK_USHORT,
-              TK_WCHAR,TK_ULONG,TK_LONGLONG,TK_ULONGLONG,TK_OCTET,
-              TK_FLOAT,TK_DOUBLE,TK_LONGDOUBLE,TK_CHAR,TK_STRING,TK_WSTRING,
-              TK_VALUE, TK_VALUE_BOX,TK_TYPECODE,TK_OBJREF,
-              TK_ABSTRACT_INTERFACE,TK_PRINCIPAL].include?(rtc.resolved_tc.kind)
+          if [TK_NULL, TK_VOID, TK_ANY, TK_BOOLEAN, TK_SHORT, TK_LONG, TK_USHORT,
+              TK_WCHAR, TK_ULONG, TK_LONGLONG, TK_ULONGLONG, TK_OCTET,
+              TK_FLOAT, TK_DOUBLE, TK_LONGDOUBLE, TK_CHAR, TK_STRING, TK_WSTRING,
+              TK_VALUE, TK_VALUE_BOX, TK_TYPECODE, TK_OBJREF,
+              TK_ABSTRACT_INTERFACE, TK_PRINCIPAL].include?(rtc.resolved_tc.kind)
             case rtc.resolved_tc.kind
             when TK_NULL, TK_VOID
               # leave as is
@@ -189,7 +191,7 @@ module R2CORBA
             when TK_DOUBLE
               rval = jany.extract_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
               rval = BigDecimal(jany.extract_fixed().toString())
             when TK_CHAR
@@ -217,14 +219,14 @@ module R2CORBA
                 jobj
               end
             when TK_PRINCIPAL
-              raise CORBA::NO_IMPLEMENT.new('Principal not supported',0,CORBA::COMPLETED_NO)
+              raise CORBA::NO_IMPLEMENT.new('Principal not supported', 0, CORBA::COMPLETED_NO)
             ## TODO: TK_NATIVE
             else
-              raise CORBA::MARSHAL.new("unknown kind [#{rtc.kind}]",0,CORBA::COMPLETED_NO)
+              raise CORBA::MARSHAL.new("unknown kind [#{rtc.kind}]", 0, CORBA::COMPLETED_NO)
             end
           else
             dynFactory = CORBA::Native::Dynamic::DynAnyFactoryHelper.narrow(
-                          (jorb || CORBA::ORB._orb).resolve_initial_references("DynAnyFactory"))
+                          (jorb || CORBA::ORB._orb).resolve_initial_references('DynAnyFactory'))
             jdynany = dynFactory.create_dyn_any(jany)
             begin
               restc = rtc.resolved_tc
@@ -239,7 +241,7 @@ module R2CORBA
                 jdynany.get_elements().each {|e| rval << Any.from_java(e, jorb, restc.content_type) }
               when TK_STRUCT, TK_EXCEPT
                 rval = rtc.get_type.new
-                jdynany.get_members().each_with_index {|nvp,i| rval.__send__("#{nvp.id}=".intern, Any.from_java(nvp.value, jorb, restc.member_type(i))) }
+                jdynany.get_members().each_with_index {|nvp, i| rval.__send__("#{nvp.id}=".intern, Any.from_java(nvp.value, jorb, restc.member_type(i))) }
               when TK_UNION
                 rval = rtc.get_type.new
                 if jdynany.get_discriminator().type().kind().value() == CORBA::TK_OCTET
@@ -255,7 +257,7 @@ module R2CORBA
                   rval.instance_variable_set('@value', Any.from_java(jdynany.member.to_any, jorb, restc.member_type(minx)))
                 end
               else
-                raise CORBA::MARSHAL.new("unknown kind [#{rtc.kind}]",0,CORBA::COMPLETED_NO)
+                raise CORBA::MARSHAL.new("unknown kind [#{rtc.kind}]", 0, CORBA::COMPLETED_NO)
               end
             ensure
               jdynany.destroy

data/lib/corba/jbase/ORB.rb

@@ -38,12 +38,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
@@ -52,14 +52,14 @@ module R2CORBA
           raise ArgumentError, "Invalid argument #{prop.class}; expected Hash" unless prop.nil? || Hash === prop
           jprop = Java::JavaUtil::Properties.new
           jprop.setProperty('ORBid', orb_id) if orb_id
-          prop.each { |k,v| jprop.setProperty(k.to_s, v.to_s) } if prop
+          prop.each { |k, v| jprop.setProperty(k.to_s, v.to_s) } if prop
           @@cached_orb = CORBA::Native::ORB.init(argv.collect {|a| a.to_s }.to_java(:string), jprop)
         end
         @@wrapper_klass.new(n_orb)
       end
 
-      #str ::String
-      #ret ::CORBA::Object
+      # str ::String
+      # ret ::CORBA::Object
       def string_to_object(str)
         begin
           begin

data/lib/corba/jbase/Object.rb

@@ -14,11 +14,11 @@ module R2CORBA
 
     module Object
 
-      #ret InterfaceDef
+      # ret InterfaceDef
       def _get_interface()
         raise ::CORBA::NO_IMPLEMENT
-        #ifdef_obj = self.objref_._get_interface_def rescue CORBA::Exception.native2r($!)
-        #(ifdef_obj = CORBA::Native::InterfaceDefHelper.narrow(ifdef_obj) rescue CORBA::Exception.native2r($!)) unless ifdef_obj.nil?
+        # ifdef_obj = self.objref_._get_interface_def rescue CORBA::Exception.native2r($!)
+        # (ifdef_obj = CORBA::Native::InterfaceDefHelper.narrow(ifdef_obj) rescue CORBA::Exception.native2r($!)) unless ifdef_obj.nil?
       end
 
       # ::String logical_type_id
@@ -48,7 +48,7 @@ module R2CORBA
       end
 
       unless CORBA::Native::Portable::ObjectImpl.public_instance_methods.include?(:_get_component)
-        #ret ::CORBA::Object
+        # ret ::CORBA::Object
         def _get_component()
           raise CORBA::INV_OBJREF.new if self._is_nil?()
           ## ask the remote side
@@ -60,27 +60,27 @@ module R2CORBA
         end
       end
 
-      #def PolicyType policy_type
+      # def PolicyType policy_type
       # ret Policy
       def _get_policy(policy_type)
         raise ::CORBA::NO_IMPLEMENT
       end
 
-      #PolicyList policies
-      #SetOverrideType set_add
-      #ret ::CORBA::Object
-      def _set_policy_overrides(policies, set_add )
+      # PolicyList policies
+      # SetOverrideType set_add
+      # ret ::CORBA::Object
+      def _set_policy_overrides(policies, set_add)
         raise ::CORBA::NO_IMPLEMENT
       end
 
-      #int[] types
-      #ret PolicyList
+      # int[] types
+      # ret PolicyList
       def _get_policy_overrides(types)
         raise ::CORBA::NO_IMPLEMENT
       end
 
-      #PolicyList inconsistent_policies
-      #ret bool
+      # PolicyList inconsistent_policies
+      # ret bool
       def _validate_connection(inconsistent_policies)
         raise ::CORBA::NO_IMPLEMENT
       end

data/lib/corba/jbase/Request.rb

@@ -36,7 +36,7 @@ module R2CORBA
         end
       end
 
-      def add_in_arg(tc, val, nm='')
+      def add_in_arg(tc, val, nm = '')
         begin
           self.req_.arguments.add_value(nm, Any.to_any(val, tc).to_java(self.req_.target._orb), CORBA::ARG_IN)
         rescue ::NativeException
@@ -45,7 +45,7 @@ module R2CORBA
         self.req_.arguments.count
       end
 
-      def add_out_arg(tc, nm='')
+      def add_out_arg(tc, nm = '')
         begin
           self.req_.arguments.add_value(nm, Any.to_any(nil, tc).to_java(self.req_.target._orb), CORBA::ARG_OUT)
         rescue ::NativeException
@@ -54,7 +54,7 @@ module R2CORBA
         self.req_.arguments.count
       end
 
-      def add_inout_arg(tc, val, nm='')
+      def add_inout_arg(tc, val, nm = '')
         begin
           self.req_.arguments.add_value(nm, Any.to_any(val, tc).to_java(self.req_.target._orb), CORBA::ARG_INOUT)
         rescue ::NativeException
@@ -88,7 +88,7 @@ module R2CORBA
         # clear current arguments
         begin
           nvl = self.req_.arguments
-          nvl.remove(0) while nvl.count>0
+          nvl.remove(0) while nvl.count > 0
         rescue
           CORBA::Exception.native2r($!)
         end
@@ -120,7 +120,7 @@ module R2CORBA
         begin
           # clear current exceptions
           jexl = self.req_.exceptions
-          jexl.remove(0) while jexl.count>0
+          jexl.remove(0) while jexl.count > 0
           # add new exceptions
           exl.each do |extc|
             jexl.add(extc.tc_)
@@ -161,7 +161,7 @@ module R2CORBA
           elsif jex.is_a?(CORBA::Native::UnknownUserException)
             CORBA::UserException._raise(jex)
           else
-            raise CORBA::UNKNOWN.new(jex.getMessage(),0,CORBA::COMPLETED_MAYBE)
+            raise CORBA::UNKNOWN.new(jex.getMessage(), 0, CORBA::COMPLETED_MAYBE)
           end
         end
         self.result
@@ -207,12 +207,12 @@ module R2CORBA
           nvl = self.req_.arguments
           nvl.count.times do |i|
             nv = nvl.item(i)
-            rc << Any.from_java(nv.value,self.req_.target._orb) unless nv.flags == CORBA::ARG_IN
+            rc << Any.from_java(nv.value, self.req_.target._orb) unless nv.flags == CORBA::ARG_IN
           end
         rescue
           CORBA::Exception.native2r($!)
         end
-        if rc.size<2
+        if rc.size < 2
           return rc.shift
         else
           return *rc

data/lib/corba/jbase/Servant.rb

@@ -39,7 +39,7 @@ module R2CORBA
 
         def invoke(jsrvreq)
           begin
-            raise CORBA::NO_IMPLEMENT.new('',0,CORBA::COMPLETED_NO) unless @rsrv
+            raise CORBA::NO_IMPLEMENT.new('', 0, CORBA::COMPLETED_NO) unless @rsrv
             rsrvreq = CORBA::ServerRequest._wrap_native(jsrvreq, self._orb())
             begin
               case rsrvreq.srvreq_.operation()
@@ -80,9 +80,9 @@ module R2CORBA
             else
               STDERR.puts "#{ex_}\n#{ex_.backtrace.join("\n")}" unless $VERBOSE
               if jsrvreq.respond_to?(:setSystemException) # JacORB special
-                jsrvreq.setSystemException(CORBA::Native::UNKNOWN.new("#{ex_}",0,CORBA::Native::CompletionStatus.from_int(CORBA::COMPLETED_MAYBE)))
+                jsrvreq.setSystemException(CORBA::Native::UNKNOWN.new("#{ex_}", 0, CORBA::Native::CompletionStatus.from_int(CORBA::COMPLETED_MAYBE)))
               else
-                jsrvreq.set_exception(CORBA::Any.to_any(CORBA::UNKNOWN.new("#{ex_}",0,CORBA::COMPLETED_MAYBE)).to_java(self._orb()))
+                jsrvreq.set_exception(CORBA::Any.to_any(CORBA::UNKNOWN.new("#{ex_}", 0, CORBA::COMPLETED_MAYBE)).to_java(self._orb()))
               end
             end
           rescue CORBA::SystemException => ex_
@@ -96,9 +96,9 @@ module R2CORBA
           rescue Exception => ex_
             STDERR.puts "#{ex_}\n#{ex_.backtrace.join("\n")}"
             if jsrvreq.respond_to?(:setSystemException) # JacORB special
-              jsrvreq.setSystemException(CORBA::Native::UNKNOWN.new("#{ex_}",0,CORBA::Native::CompletionStatus.from_int(CORBA::COMPLETED_MAYBE)))
+              jsrvreq.setSystemException(CORBA::Native::UNKNOWN.new("#{ex_}", 0, CORBA::Native::CompletionStatus.from_int(CORBA::COMPLETED_MAYBE)))
             else
-              jsrvreq.set_exception(CORBA::Any.to_any(CORBA::UNKNOWN.new("#{ex_}",0,CORBA::COMPLETED_MAYBE)).to_java(self._orb()))
+              jsrvreq.set_exception(CORBA::Any.to_any(CORBA::UNKNOWN.new("#{ex_}", 0, CORBA::COMPLETED_MAYBE)).to_java(self._orb()))
             end
           end
         end
@@ -172,8 +172,8 @@ module R2CORBA
           opsym = alt_opsym if alt_opsym && alt_opsym.is_a?(Symbol)
           results = @rsrv.__send__(opsym, *rsrvreq.arguments)
           unless rsrvreq.result_type_.nil?
-            result_value = (rsrvreq.arg_out_>0 ? results.shift : results) unless rsrvreq.result_type_.kind == CORBA::TK_VOID
-            if rsrvreq.arg_out_>0
+            result_value = (rsrvreq.arg_out_ > 0 ? results.shift : results) unless rsrvreq.result_type_.kind == CORBA::TK_VOID
+            if rsrvreq.arg_out_ > 0
               rsrvreq.nvlist_.count().times do |i|
                 jnv = rsrvreq.nvlist_.item(i)
                 if [CORBA::ARG_OUT, CORBA::ARG_INOUT].include?(jnv.flags)
@@ -192,8 +192,8 @@ module R2CORBA
         def invoke_DSI(rsrvreq)
           results = @rsrv.invoke(rsrvreq)
           unless rsrvreq.result_type_.nil?
-            result_value = (rsrvreq.arg_out_>0 ? results.shift : results) unless rsrvreq.result_type_.kind == CORBA::TK_VOID
-            if rsrvreq.arg_out_>0
+            result_value = (rsrvreq.arg_out_ > 0 ? results.shift : results) unless rsrvreq.result_type_.kind == CORBA::TK_VOID
+            if rsrvreq.arg_out_ > 0
               rsrvreq.nvlist_.count().times do |i|
                 jnv = rsrvreq.nvlist_.item(i)
                 if [CORBA::ARG_OUT, CORBA::ARG_INOUT].include?(jnv.flags)
@@ -233,7 +233,7 @@ module R2CORBA
             # not in call context or not associated with ORB yet
           end
         end
-        raise CORBA::BAD_INV_ORDER.new('no ORB initialized',0,CORBA::COMPLETED_NO) if CORBA::ORB._orb.nil?
+        raise CORBA::BAD_INV_ORDER.new('no ORB initialized', 0, CORBA::COMPLETED_NO) if CORBA::ORB._orb.nil?
         begin
           return CORBA::Object._wrap_native(self.srvref_._this_object(CORBA::ORB._orb))
         rescue ::NativeException