r2corba 1.4.1 → 1.5.5

data/lib/corba/common/Union.rb

@@ -9,7 +9,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 module R2CORBA
@@ -53,4 +52,4 @@ module R2CORBA
       end
     end
   end
-end
+end

data/lib/corba/common/Values.rb

@@ -9,7 +9,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 module R2CORBA
@@ -89,4 +88,4 @@ module R2CORBA
     PUBLIC_MEMBER = 1
 
   end # CORBA
-end # R2CORBA
+end # R2CORBA

data/lib/corba/common/const.rb

@@ -8,12 +8,11 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 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

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 module R2CORBA

data/lib/corba/common/require.rb

@@ -8,9 +8,16 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
+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

@@ -8,14 +8,13 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 module R2CORBA
 
-  R2CORBA_MAJOR = 1.freeze
-  R2CORBA_MINOR = 4.freeze
-  R2CORBA_RELEASE = '1'.freeze
+  R2CORBA_MAJOR = 1
+  R2CORBA_MINOR = 5
+  R2CORBA_RELEASE = 5
 
   R2CORBA_VERSION = "#{R2CORBA_MAJOR}.#{R2CORBA_MINOR}.#{R2CORBA_RELEASE}".freeze
 

data/lib/corba/idl/IDL.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 module R2CORBA
 

data/lib/corba/idl/IORTable.pidl

@@ -1,5 +1,4 @@
 // -*- IDL -*-
-// $Id$
 
 #ifndef R2TAO_IORTABLE_IORTABLE_PIDL
 #define R2TAO_IORTABLE_IORTABLE_PIDL

data/lib/corba/idl/TAO_Ext.pidl

@@ -1,5 +1,4 @@
 // -*- IDL -*-
-// $Id$
 
 #ifndef R2TAO_TAO_EXT_IDL
 #define R2TAO_TAO_EXT_IDL

data/lib/corba/idl/require.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'corba/idl/IDL.rb'

data/lib/corba/jbase/Any.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 module R2CORBA
   module CORBA
@@ -21,16 +20,16 @@ module R2CORBA
       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
@@ -61,7 +60,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
@@ -69,7 +68,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
@@ -95,10 +94,10 @@ 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
@@ -113,15 +112,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?
@@ -135,7 +134,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?
@@ -157,11 +156,11 @@ module R2CORBA
         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
@@ -190,9 +189,9 @@ 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.new(jany.extract_fixed().toString())
+              rval = BigDecimal(jany.extract_fixed().toString())
             when TK_CHAR
               rval = jany.extract_char().chr
             when TK_STRING
@@ -218,10 +217,10 @@ 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(
@@ -240,7 +239,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
@@ -256,7 +255,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/IORMap.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 module R2CORBA
@@ -33,4 +32,4 @@ module R2CORBA
       end
     end
   end
-end
+end

data/lib/corba/jbase/ORB.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 module R2CORBA
@@ -16,22 +15,35 @@ module R2CORBA
 
     module ORB
 
+      class << self
+        protected
+        def _singleton_orb_init
+          begin
+            CORBA::Native::ORB.init
+          rescue ArgumentError
+            # this will happen if java.endorsed.dirs is used with JacORB
+            # in that case just directly init on the singleton class itself
+            CORBA::Native::ORBSingleton.init
+          end
+        end
+      end
+
       ## init() or init(arg1, arg2[, ...]) or init(orb_id, prop = {}) or init(argv, orb_id, prop={}) or init(argv, prop={})
       def self.init(*args)
         n_orb = if args.empty?
-          CORBA::Native::ORB.init
+          _singleton_orb_init
         else
           argv = []
           orb_id = nil
           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
@@ -40,7 +52,7 @@ 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)

data/lib/corba/jbase/Object.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 module R2CORBA
   module CORBA
@@ -42,22 +41,23 @@ module R2CORBA
         ## if this object ref has already been narrowed
         return self._interface_repository_id if self.respond_to?(:_interface_repository_id)
         ## ask the remote side
-        ## have to do this ourselves since JacORB does not support this method
-        ## and we can't use #invoke since this should work without narrowing
+        ## have to do this ourselves since JacORB only resolves this locally (never calling remote)
         req = self._request('_repository_id')
         req.set_return_type(CORBA._tc_string)
         return req.invoke
       end
 
-      #ret ::CORBA::Object
-      def _get_component()
-        raise CORBA::INV_OBJREF.new if self._is_nil?()
-        ## ask the remote side
-        ## have to do this ourselves since JacORB does not support this method
-        ## and we can't use #invoke since this should work without narrowing
-        req = self._request('_component')
-        req.set_return_type(CORBA._tc_Object)
-        return req.invoke
+      unless CORBA::Native::Portable::ObjectImpl.public_instance_methods.include?(:_get_component)
+        #ret ::CORBA::Object
+        def _get_component()
+          raise CORBA::INV_OBJREF.new if self._is_nil?()
+          ## ask the remote side
+          ## have to do this ourselves since JacORB does not support this remote method on Object
+          ## and we can't use #invoke since this should work without narrowing
+          req = self._request('_component')
+          req.set_return_type(CORBA._tc_Object)
+          return req.invoke
+        end
       end
 
       #def PolicyType policy_type

data/lib/corba/jbase/Request.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 module R2CORBA
   module CORBA
@@ -89,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
@@ -121,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_)
@@ -162,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
@@ -208,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
@@ -223,4 +222,4 @@ module R2CORBA
     end
 
   end # CORBA
-end # R2CORBA
+end # R2CORBA

data/lib/corba/jbase/Servant.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 module R2CORBA
@@ -40,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()
@@ -66,7 +65,7 @@ module R2CORBA
                 rsrvreq.describe({:arg_list => [], :result_type => CORBA._tc_Object})
                 rc = self._get_component(*rsrvreq.arguments)
                 jany = rsrvreq.orb_.create_any()
-                jany.insert_Object(rc.objref_)
+                jany.insert_Object(rc)
                 jsrvreq.set_result(jany)
               else
                 @rsrv.is_a?(PortableServer::DynamicImplementation) ? self.invoke_DSI(rsrvreq) : self.invoke_SI(rsrvreq)
@@ -81,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_
@@ -97,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
@@ -156,7 +155,8 @@ module R2CORBA
           if @rsrv.nil?
             return nil
           elsif @rsrv.respond_to?(:_get_component)
-            return @rsrv._get_component
+            obj = @rsrv._get_component
+            return obj ? obj.objref_ : nil
           else
             return super
           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
@@ -244,4 +244,4 @@ module R2CORBA
 
   end # PortableServer
 
-end # R2CORBA
+end # R2CORBA