r2corba 1.6.2 → 1.7.1

data/lib/corba/common/require.rb

@@ -11,14 +11,12 @@
 #--------------------------------------------------------------------
 
 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',
+['version',
   'const',
   'IDL',
   'exception',

data/lib/corba/common/version.rb

@@ -11,11 +11,9 @@
 #--------------------------------------------------------------------
 
 module R2CORBA
-
   R2CORBA_MAJOR = 1
-  R2CORBA_MINOR = 6
-  R2CORBA_RELEASE = 2
+  R2CORBA_MINOR = 7
+  R2CORBA_RELEASE = 1
 
   R2CORBA_VERSION = "#{R2CORBA_MAJOR}.#{R2CORBA_MINOR}.#{R2CORBA_RELEASE}".freeze
-
 end

data/lib/corba/idl/IDL.rb

@@ -10,11 +10,9 @@
 # Copyright (c) Remedy IT Expertise BV
 #--------------------------------------------------------------------
 module R2CORBA
-
   module CORBA
     def CORBA.implement(idlfile, params = {}, genbits = IDL::CLIENT_STUB, &block)
       IDL.implement(idlfile, params, genbits, &block)
     end
   end
-
 end

data/lib/corba/idl/require.rb

@@ -10,8 +10,8 @@
 # Copyright (c) Remedy IT Expertise BV
 #--------------------------------------------------------------------
 
-require 'corba/idl/IDL.rb'
-require 'corba/idl/r2c_orb.rb'
+require 'corba/idl/IDL'
+require 'corba/idl/r2c_orb'
 
 ## fake Ruby into believing 'orb.rb' has already been loaded
 ## which is what the IDL compiler will generate for

data/lib/corba/jbase/Any.rb

@@ -33,7 +33,7 @@ module R2CORBA
                             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()
+            jany ||= jorb.create_any
             case restc.kind
             when TK_NULL
               # leave any as is
@@ -70,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
@@ -114,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?
@@ -142,7 +142,7 @@ module R2CORBA
               if jany.nil?
                 jany = jdynany.to_any
               else
-                jany.read_value(jdynany.to_any.create_input_stream(), rtc.tc_)
+                jany.read_value(jdynany.to_any.create_input_stream, rtc.tc_)
               end
             ensure
               jdynany.destroy
@@ -167,52 +167,52 @@ module R2CORBA
             when TK_NULL, TK_VOID
               # leave as is
             when TK_ANY
-              rval = Any.from_java(jany.extract_any(), jorb)
+              rval = Any.from_java(jany.extract_any, jorb)
             when TK_BOOLEAN
-              rval = jany.extract_boolean()
+              rval = jany.extract_boolean
             when TK_SHORT
-              rval = jany.extract_short()
+              rval = jany.extract_short
             when TK_LONG
-              rval = jany.extract_long()
+              rval = jany.extract_long
             when TK_USHORT
-              rval = [jany.extract_ushort()].pack('s').unpack('S').first
+              rval = [jany.extract_ushort].pack('s').unpack('S').first
             when TK_WCHAR
-              rval = jany.extract_wchar()
+              rval = jany.extract_wchar
             when TK_ULONG
-              rval = [jany.extract_ulong()].pack('l').unpack('L').first
+              rval = [jany.extract_ulong].pack('l').unpack('L').first
             when TK_LONGLONG
-              rval = jany.extract_longlong()
+              rval = jany.extract_longlong
             when TK_ULONGLONG
-              rval = [jany.extract_ulonglong()].pack('q').unpack('Q').first
+              rval = [jany.extract_ulonglong].pack('q').unpack('Q').first
             when TK_OCTET
-              rval = [jany.extract_octet()].pack('c').unpack('C').first
+              rval = [jany.extract_octet].pack('c').unpack('C').first
             when TK_FLOAT
-              rval = jany.extract_float()
+              rval = jany.extract_float
             when TK_DOUBLE
-              rval = jany.extract_double()
+              rval = jany.extract_double
             when TK_LONGDOUBLE
               raise CORBA::NO_IMPLEMENT.new('LongDouble not supported', 0, CORBA::COMPLETED_NO)
             when TK_FIXED
-              rval = BigDecimal(jany.extract_fixed().toString())
+              rval = BigDecimal(jany.extract_fixed.toString)
             when TK_CHAR
-              rval = jany.extract_char().chr
+              rval = jany.extract_char.chr
             when TK_STRING
-              rval = jany.extract_string()
+              rval = jany.extract_string
             when TK_WSTRING
-              rval = jany.extract_wstring()
+              rval = jany.extract_wstring
             when TK_VALUE
-              rval = jany.extract_Value()
+              rval = jany.extract_Value
             when TK_VALUE_BOX
               rtc.get_type::Factory._check_factory(jorb || CORBA::ORB._orb) # make sure valuebox factory has been registered
-              rval = jany.extract_Value()
+              rval = jany.extract_Value
               rval = rval.value unless rval.nil?
             when TK_TYPECODE
-              rval = CORBA::TypeCode.from_native(jany.extract_TypeCode())
+              rval = CORBA::TypeCode.from_native(jany.extract_TypeCode)
             when TK_OBJREF
-              rval = CORBA::Object._wrap_native(jany.extract_Object())
+              rval = CORBA::Object._wrap_native(jany.extract_Object)
               rval = rtc.get_type._narrow(rval) if rval
             when TK_ABSTRACT_INTERFACE
-              jobj = jany.create_input_stream().read_abstract_interface()
+              jobj = jany.create_input_stream.read_abstract_interface
               rval = if jobj.is_a?(CORBA::Native::Object)
                 rtc.get_type._narrow(CORBA::Object._wrap_native(jobj))
               else
@@ -232,24 +232,24 @@ module R2CORBA
               restc = rtc.resolved_tc
               case restc.kind
               when TK_ENUM
-                rval = jdynany.get_as_ulong()
+                rval = jdynany.get_as_ulong
               when TK_ARRAY
                 rval = rtc.get_type.new
-                jdynany.get_elements().each {|e| rval << Any.from_java(e, jorb, restc.content_type) }
+                jdynany.get_elements.each { |e| rval << Any.from_java(e, jorb, restc.content_type) }
               when TK_SEQUENCE
                 rval = rtc.get_type.new
-                jdynany.get_elements().each {|e| rval << Any.from_java(e, jorb, restc.content_type) }
+                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
-                  rdisc = jdynany.get_discriminator().get_octet()
+                if jdynany.get_discriminator.type.kind.value == CORBA::TK_OCTET
+                  rdisc = jdynany.get_discriminator.get_octet
                   # Octet 0 designates default member
                   rdisc = rdisc == 0 ? :default : rdisc
                 else
-                  rdisc = Any.from_java(jdynany.get_discriminator().to_any(), jorb, restc.discriminator_type)
+                  rdisc = Any.from_java(jdynany.get_discriminator.to_any, jorb, restc.discriminator_type)
                 end
                 rval.instance_variable_set('@discriminator', rdisc)
                 unless jdynany.has_no_active_member
@@ -268,7 +268,6 @@ module R2CORBA
         end
         return rval
       end # from_java
-
     end # Any
   end # CORBA
 end # R2CORBA

data/lib/corba/jbase/ORB.rb

@@ -12,9 +12,7 @@
 
 module R2CORBA
   module CORBA
-
     module ORB
-
       class << self
         protected
         def _singleton_orb_init
@@ -39,21 +37,24 @@ module R2CORBA
           a1, a2, a3 = args
           if Array === a1
             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
+
             orb_id = a1
             prop = a2
           else
             argv = args
           end
           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
-          @@cached_orb = CORBA::Native::ORB.init(argv.collect {|a| a.to_s }.to_java(:string), jprop)
+          @@cached_orb = CORBA::Native::ORB.init(argv.collect { |a| a.to_s }.to_java(:string), jprop)
         end
         @@wrapper_klass.new(n_orb)
       end
@@ -84,7 +85,7 @@ module R2CORBA
             rescue ::NativeException
               CORBA::Exception.native2r($!)
             end
-          end).join()
+          end).join
         else
           # need to start a shutdown *with* waiting in a thread because JacORB
           # occasionally fails with a comm error when #shutdown(false) is called
@@ -104,8 +105,6 @@ module R2CORBA
       def ior_map
         @iormap ||= R2CORBA::IORMap.new(self)
       end
-
     end
-
   end # CORBA
 end # R2CORBA

data/lib/corba/jbase/Object.rb

@@ -11,11 +11,9 @@
 #--------------------------------------------------------------------
 module R2CORBA
   module CORBA
-
     module Object
-
       # ret InterfaceDef
-      def _get_interface()
+      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?
@@ -24,10 +22,11 @@ module R2CORBA
       # ::String logical_type_id
       # ret boolean
       def _is_a?(logical_type_id)
-        raise CORBA::INV_OBJREF.new if self._is_nil?()
+        raise CORBA::INV_OBJREF.new if self._is_nil?
         ## JacORB's LocalObjects throw NO_IMPLEMENT on _is_a?() and _ids() is also not always defined
         return true if self.objref_.is_a?(CORBA::Native::LocalObject) &&
-                        (!self.objref_.respond_to?(:_ids) || self.objref_._ids().include?(logical_type_id))
+                        (!self.objref_.respond_to?(:_ids) || self.objref_._ids.include?(logical_type_id))
+
         begin
           self.objref_._is_a(logical_type_id)
         rescue ::NativeException
@@ -36,10 +35,11 @@ module R2CORBA
       end
 
       # ret ::String
-      def _repository_id()
-        raise CORBA::INV_OBJREF.new if self._is_nil?()
+      def _repository_id
+        raise CORBA::INV_OBJREF.new if self._is_nil?
         ## 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 only resolves this locally (never calling remote)
         req = self._request('_repository_id')
@@ -49,8 +49,9 @@ module R2CORBA
 
       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?()
+        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
@@ -92,7 +93,6 @@ module R2CORBA
           CORBA::Exception.native2r($!)
         end
       end
-
     end # Object
   end # CORBA
 end # R2CORBA

data/lib/corba/jbase/Request.rb

@@ -11,7 +11,6 @@
 #--------------------------------------------------------------------
 module R2CORBA
   module CORBA
-
     module Request
       @@wrapper_klass = Class.new do
         include CORBA::Request
@@ -25,12 +24,13 @@ module R2CORBA
 
       def self._wrap_native(nreq, target)
         raise ArgumentError, 'Expected org.omg.CORBA.Request' unless nreq.nil? || nreq.is_a?(Native::Request)
-        nreq.nil?() ? nreq : @@wrapper_klass.new(nreq, target)
+
+        nreq.nil? ? nreq : @@wrapper_klass.new(nreq, target)
       end
 
       def operation
         begin
-          self.req_.operation()
+          self.req_.operation
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
@@ -80,10 +80,11 @@ module R2CORBA
 
       def arguments=(*args)
         if args.size == 1
-          raise ArgumentError, 'invalid argument list' unless ::Array === args.first && args.first.all? {|a| ::Array === a }
+          raise ArgumentError, 'invalid argument list' unless ::Array === args.first && args.first.all? { |a| ::Array === a }
+
           args = args.first
         else
-          raise ArgumentError, 'invalid argument list' unless args.all? {|a| ::Array === a }
+          raise ArgumentError, 'invalid argument list' unless args.all? { |a| ::Array === a }
         end
         # clear current arguments
         begin
@@ -153,7 +154,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-        jex = self.req_.env().exception()
+        jex = self.req_.env.exception
         unless jex.nil?
           STDERR.puts "#{jex}\n#{jex.backtrace.join("\n")}" if $VERBOSE
           if jex.is_a?(CORBA::Native::SystemException)
@@ -161,7 +162,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
@@ -218,8 +219,6 @@ module R2CORBA
           return *rc
         end
       end
-
     end
-
   end # CORBA
 end # R2CORBA

data/lib/corba/jbase/Servant.rb

@@ -11,11 +11,8 @@
 #--------------------------------------------------------------------
 
 module R2CORBA
-
   module PortableServer
-
     module DSI
-
       class Servant < PortableServer::Native::DynamicImplementation
         def self.new_instance(rsrv)
           srv = PortableServer::DSI::Servant.new
@@ -33,38 +30,39 @@ module R2CORBA
           @rsrv
         end
 
-        def detach_rbServant()
+        def detach_rbServant
           @rsrv = nil
         end
 
         def invoke(jsrvreq)
           begin
             raise CORBA::NO_IMPLEMENT.new('', 0, CORBA::COMPLETED_NO) unless @rsrv
-            rsrvreq = CORBA::ServerRequest._wrap_native(jsrvreq, self._orb())
+
+            rsrvreq = CORBA::ServerRequest._wrap_native(jsrvreq, self._orb)
             begin
-              case rsrvreq.srvreq_.operation()
+              case rsrvreq.srvreq_.operation
               when '_is_a'
-                rsrvreq.describe({:arg_list => [['', CORBA::ARG_IN, CORBA._tc_string]], :result_type => CORBA._tc_boolean})
+                rsrvreq.describe({arg_list: [['', CORBA::ARG_IN, CORBA._tc_string]], result_type: CORBA._tc_boolean})
                 rc = self._is_a(*rsrvreq.arguments)
-                jany = rsrvreq.orb_.create_any()
+                jany = rsrvreq.orb_.create_any
                 jany.insert_boolean(rc == true)
                 jsrvreq.set_result(jany)
               when '_non_existent'
-                rsrvreq.describe({:arg_list => [], :result_type => CORBA._tc_boolean})
+                rsrvreq.describe({arg_list: [], result_type: CORBA._tc_boolean})
                 rc = self._non_existent(*rsrvreq.arguments)
-                jany = rsrvreq.orb_.create_any()
+                jany = rsrvreq.orb_.create_any
                 jany.insert_boolean(rc == true)
                 jsrvreq.set_result(jany)
               when '_repository_id'
-                rsrvreq.describe({:arg_list => [], :result_type => CORBA._tc_string})
+                rsrvreq.describe({arg_list: [], result_type: CORBA._tc_string})
                 rc = self._repository_id(*rsrvreq.arguments)
-                jany = rsrvreq.orb_.create_any()
+                jany = rsrvreq.orb_.create_any
                 jany.insert_string(rc)
                 jsrvreq.set_result(jany)
               when '_component'
-                rsrvreq.describe({:arg_list => [], :result_type => CORBA._tc_Object})
+                rsrvreq.describe({arg_list: [], result_type: CORBA._tc_Object})
                 rc = self._get_component(*rsrvreq.arguments)
-                jany = rsrvreq.orb_.create_any()
+                jany = rsrvreq.orb_.create_any
                 jany.insert_Object(rc)
                 jsrvreq.set_result(jany)
               else
@@ -75,14 +73,14 @@ module R2CORBA
             end
           rescue CORBA::UserException => ex_
             STDERR.puts "#{ex_}\n#{ex_.backtrace.join("\n")}" if $VERBOSE
-            if rsrvreq.exc_list_.nil? || rsrvreq.exc_list_.any? {|extc| extc.id == ex_.class._tc.id }
-              jsrvreq.set_exception(CORBA::Any.to_any(ex_).to_java(self._orb()))
+            if rsrvreq.exc_list_.nil? || rsrvreq.exc_list_.any? { |extc| extc.id == ex_.class._tc.id }
+              jsrvreq.set_exception(CORBA::Any.to_any(ex_).to_java(self._orb))
             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)))
               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_
@@ -91,14 +89,14 @@ module R2CORBA
               jex_klass = CORBA::Native.const_get(ex_.class::Name)
               jsrvreq.setSystemException(jex_klass.new(ex_.reason, ex_.minor, CORBA::Native::CompletionStatus.from_int(ex_.completed)))
             else
-              jsrvreq.set_exception(CORBA::Any.to_any(ex_).to_java(self._orb()))
+              jsrvreq.set_exception(CORBA::Any.to_any(ex_).to_java(self._orb))
             end
           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)))
             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
@@ -108,7 +106,7 @@ module R2CORBA
             return [].to_java(:string)
           elsif @rsrv.respond_to?(:_ids)
             return @rsrv._ids.to_java(:string)
-          elsif @rsrv.class.constants.any? {|c| c.to_sym == :Ids }
+          elsif @rsrv.class.constants.any? { |c| c.to_sym == :Ids }
             return @rsrv.class::Ids.to_java(:string)
           elsif @rsrv.respond_to?(:_primary_interface)
             return [@rsrv._primary_interface(oid, poa)].to_java(:string)
@@ -141,7 +139,7 @@ module R2CORBA
           end
         end
 
-        def _non_existent()
+        def _non_existent
           if @rsrv.nil?
             return true
           elsif @rsrv.respond_to?(:_non_existent)
@@ -151,7 +149,7 @@ module R2CORBA
           end
         end
 
-        def _get_component()
+        def _get_component
           if @rsrv.nil?
             return nil
           elsif @rsrv.respond_to?(:_get_component)
@@ -163,7 +161,7 @@ module R2CORBA
         end
         protected
         def invoke_SI(rsrvreq)
-          opsym = rsrvreq.srvreq_.operation().to_sym
+          opsym = rsrvreq.srvreq_.operation.to_sym
           opsig = @rsrv.get_operation_signature(opsym)
           # explicitly define empty (but not nil) exceptionlist if not yet specified
           opsig[:exc_list] = [] if (Hash === opsig) && !opsig.has_key?(:exc_list)
@@ -174,17 +172,17 @@ module R2CORBA
           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
-              rsrvreq.nvlist_.count().times do |i|
+              rsrvreq.nvlist_.count.times do |i|
                 jnv = rsrvreq.nvlist_.item(i)
                 if [CORBA::ARG_OUT, CORBA::ARG_INOUT].include?(jnv.flags)
                   rval = results.shift
                   rtc = rsrvreq.arg_list_[i][2]
-                  CORBA::Any.to_any(rval, rtc).to_java(self._orb(), jnv.value())
+                  CORBA::Any.to_any(rval, rtc).to_java(self._orb, jnv.value)
                 end
               end
             end
             unless rsrvreq.result_type_.kind == CORBA::TK_VOID
-              rsrvreq.srvreq_.set_result(CORBA::Any.to_any(result_value, rsrvreq.result_type_).to_java(self._orb()))
+              rsrvreq.srvreq_.set_result(CORBA::Any.to_any(result_value, rsrvreq.result_type_).to_java(self._orb))
             end
           end
         end
@@ -194,22 +192,21 @@ module R2CORBA
           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
-              rsrvreq.nvlist_.count().times do |i|
+              rsrvreq.nvlist_.count.times do |i|
                 jnv = rsrvreq.nvlist_.item(i)
                 if [CORBA::ARG_OUT, CORBA::ARG_INOUT].include?(jnv.flags)
                   rval = results.shift
                   rtc = rsrvreq.arg_list_[i][2]
-                  CORBA::Any.to_any(rval, rtc).to_java(self._orb(), jnv.value())
+                  CORBA::Any.to_any(rval, rtc).to_java(self._orb, jnv.value)
                 end
               end
             end
             unless rsrvreq.result_type_.kind == CORBA::TK_VOID
-              rsrvreq.srvreq_.set_result(CORBA::Any.to_any(result_value, rsrvreq.result_type_).to_java(self._orb()))
+              rsrvreq.srvreq_.set_result(CORBA::Any.to_any(result_value, rsrvreq.result_type_).to_java(self._orb))
             end
           end
         end
       end # Servant
-
     end # DSI
 
     class Servant
@@ -217,23 +214,24 @@ module R2CORBA
         @srvref_ ||= PortableServer::DSI::Servant.new_instance(self)
       end
 
-      def _default_POA()
+      def _default_POA
         begin
-          return PortableServer::POA._narrow(CORBA::Object._wrap_native(self.srvref_._default_POA()))
+          return PortableServer::POA._narrow(CORBA::Object._wrap_native(self.srvref_._default_POA))
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
       end
 
-      def _this()
+      def _this
         unless @srvref_.nil?
           begin
-            return CORBA::Object._wrap_native(self.srvref_._this_object())
+            return CORBA::Object._wrap_native(self.srvref_._this_object)
           rescue NativeException
             # 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?
+
         begin
           return CORBA::Object._wrap_native(self.srvref_._this_object(CORBA::ORB._orb))
         rescue ::NativeException
@@ -241,7 +239,5 @@ module R2CORBA
         end
       end
     end # Servant
-
   end # PortableServer
-
 end # R2CORBA