r2corba 1.4.1 → 1.5.5

data/lib/corba/jbase/ServerRequest.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
@@ -53,12 +52,12 @@ module R2CORBA
       end
 
       def describe(opsig)
-        raise CORBA::BAD_INV_ORDER.new('',0,CORBA::COMPLETED_NO) if @nvlist_
-        raise CORBA::NO_IMPLEMENT.new('',0,CORBA::COMPLETED_NO) unless opsig && (Hash === opsig)
+        raise CORBA::BAD_INV_ORDER.new('', 0, CORBA::COMPLETED_NO) if @nvlist_
+        raise CORBA::NO_IMPLEMENT.new('', 0, CORBA::COMPLETED_NO) unless opsig && (Hash === opsig)
         @arg_list_ = opsig[:arg_list]
         @result_type_ = opsig[:result_type]
         @exc_list_ = opsig[:exc_list]
-        raise CORBA::BAD_PARAM.new('',0,CORBA::COMPLETED_NO) unless (@arg_list_.nil? || @arg_list_.is_a?(Array)) &&
+        raise CORBA::BAD_PARAM.new('', 0, CORBA::COMPLETED_NO) unless (@arg_list_.nil? || @arg_list_.is_a?(Array)) &&
                                                                     (@result_type_.nil? || @result_type_.is_a?(CORBA::TypeCode)) &&
                                                                     (@exc_list_.nil? || @exc_list_.is_a?(Array))
         @nvlist_ = extract_arguments_(@arg_list_)
@@ -66,7 +65,7 @@ module R2CORBA
       end
 
       def arguments
-        raise CORBA::BAD_INV_ORDER.new('',0,CORBA::COMPLETED_NO) unless @nvlist_
+        raise CORBA::BAD_INV_ORDER.new('', 0, CORBA::COMPLETED_NO) unless @nvlist_
         unless @arg_
           @arg_ = []
           @nvlist_.count().times do |i|
@@ -82,7 +81,7 @@ module R2CORBA
         self.arguments # make sure the @arg_ member has been initialized
         key = arg_index_from_name(key) if String === key
         key = key.to_i if key
-        raise CORBA::BAD_PARAM.new('', 0, CORBA::COMPLETD_NO) unless key && (key>=0) && (key<@arg_.size)
+        raise CORBA::BAD_PARAM.new('', 0, CORBA::COMPLETD_NO) unless key && (key >= 0) && (key < @arg_.size)
         @arg_[key]
       end
 
@@ -90,7 +89,7 @@ module R2CORBA
         self.arguments # make sure the @arg_ member has been initialized
         key = arg_index_from_name(key) if String === key
         key = key.to_i if key
-        raise CORBA::BAD_PARAM.new('', 0, CORBA::COMPLETD_NO) unless key && (key>=0) && (key<@arg_.size)
+        raise CORBA::BAD_PARAM.new('', 0, CORBA::COMPLETD_NO) unless key && (key >= 0) && (key < @arg_.size)
         jnv = @nvlist_.item(key)
         rtc = @arg_list_[key][2]
         CORBA::Any.to_any(val, rtc).to_java(self.orb_, jnv.value())
@@ -114,7 +113,7 @@ module R2CORBA
         unless arg_list.nil?
           arg_list.each do |argnm, argf, argtc|
             raise CORBA::BAD_PARAM.new('', 0, CORBA::COMPLETED_NO) if argf.nil? || argtc.nil? || !argtc.is_a?(CORBA::TypeCode)
-            jnvlist.add_value(argnm.to_s, Any.to_any(nil,argtc).to_java(@orb_), argf.to_i)
+            jnvlist.add_value(argnm.to_s, Any.to_any(nil, argtc).to_java(@orb_), argf.to_i)
           end
           self.srvreq_.arguments(jnvlist)
         end
@@ -125,4 +124,4 @@ module R2CORBA
 
   end # CORBA
 
-end # R2CORBA
+end # R2CORBA

data/lib/corba/jbase/Streams.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
@@ -58,7 +57,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
@@ -403,7 +402,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
@@ -610,7 +609,7 @@ module R2CORBA
         end
         def write_wstring(value)
           begin
-            self.stream_.write_wstring(value.inject('') {|s,b| s << b.chr})
+            self.stream_.write_wstring(value.inject('') {|s, b| s << b.chr})
           rescue ::NativeException
             CORBA::Exception.native2r($!)
           end
@@ -668,4 +667,4 @@ module R2CORBA
       end
     end
   end
-end
+end

data/lib/corba/jbase/Stub.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

data/lib/corba/jbase/Typecode.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/jbase/Any.rb"
 require 'bigdecimal'
@@ -163,7 +162,7 @@ module R2CORBA
             content_tc = args.shift
             length = args
             raise ArgumentError, 'expected CORBA::TypeCode' unless content_tc.is_a?(CORBA::TypeCode)
-            if length.size>1
+            if length.size > 1
               this_len = length.shift
               content_tc = self.class.new(content_tc, *length)
             else
@@ -232,12 +231,12 @@ module R2CORBA
             @members = []
             members_.each { |n, tc, access| add_member(n, tc, access) }
             jmembers = CORBA::Native::Reflect::Array.newInstance(CORBA::Native::ValueMember.java_class, @members.size)
-            @members.each_with_index do |(mn, mtc, access),i|
+            @members.each_with_index do |(mn, mtc, access), i|
               m_id = mtc.is_a?(IdentifiedTypeCode) ? mtc.id : 'IDL:*primitive*:1.0'
               jmembers[i] = CORBA::Native::ValueMember.new(mn.to_s, m_id,
                                                            name, id.split(':').last,
                                                            mtc.tc_, nil,
-                                                           access==:public ?
+                                                           access == :public ?
                                                               CORBA::PUBLIC_MEMBER :
                                                               CORBA::PRIVATE_MEMBER)
             end
@@ -248,7 +247,7 @@ module R2CORBA
 
         protected
 
-        def _create_tc(id,name,modifier,base,jmembers)
+        def _create_tc(id, name, modifier, base, jmembers)
           begin
             CORBA::ORB._orb.create_value_tc(id.to_s,
                                             name.to_s,
@@ -266,7 +265,7 @@ module R2CORBA
 
         protected
 
-        def _create_tc(id,name,modifier,base,jmembers)
+        def _create_tc(id, name, modifier, base, jmembers)
           # JaCORB 2.3.1' does not support tk_event typecodes yet;
           # so just let it be a regular valuetype
           # NOTE: this will not be interoperable between jR2CORBA and R2CORBA
@@ -369,7 +368,7 @@ module R2CORBA
             @members = []
             members_.each { |n, tc| add_member(n, tc) }
             jmembers = CORBA::Native::Reflect::Array.newInstance(CORBA::Native::StructMember.java_class, @members.size)
-            @members.each_with_index {|(mn, mtc),i| jmembers[i] = CORBA::Native::StructMember.new(mn.to_s, mtc.tc_, nil) }
+            @members.each_with_index {|(mn, mtc), i| jmembers[i] = CORBA::Native::StructMember.new(mn.to_s, mtc.tc_, nil) }
             @tc_ = _create_tc(id, name, jmembers)
             super(id)
           end
@@ -377,7 +376,7 @@ module R2CORBA
 
         protected
 
-        def _create_tc(id,name,jmembers)
+        def _create_tc(id, name, jmembers)
           begin
             CORBA::ORB._orb.create_struct_tc(id.to_s, name.to_s, jmembers)
           rescue ::NativeException
@@ -390,20 +389,20 @@ module R2CORBA
       class Except < Struct
 
         def from_java(jex)
-          raise CORBA::BAD_PARAM.new('org.om.CORBA.UserException expected',0,CORBA::COMPLETED_NO) unless jex.is_a?(CORBA::Native::UserException)
+          raise CORBA::BAD_PARAM.new('org.om.CORBA.UserException expected', 0, CORBA::COMPLETED_NO) unless jex.is_a?(CORBA::Native::UserException)
           ex = get_type.new
-          members.each {|mname,mtc| ex.__send__("#{mname}=".to_sym, jex.__send__(mname.to_sym)) }
+          members.each {|mname, mtc| ex.__send__("#{mname}=".to_sym, jex.__send__(mname.to_sym)) }
           ex
         end
 
         def is_compatible?(jex)
-          raise CORBA::BAD_PARAM.new('org.om.CORBA.UserException expected',0,CORBA::COMPLETED_NO) unless jex.is_a?(CORBA::Native::UserException)
-          members.all? {|mname,mtc| jex.respond_to?(mname.to_sym) }
+          raise CORBA::BAD_PARAM.new('org.om.CORBA.UserException expected', 0, CORBA::COMPLETED_NO) unless jex.is_a?(CORBA::Native::UserException)
+          members.all? {|mname, mtc| jex.respond_to?(mname.to_sym) }
         end
 
         protected
 
-        def _create_tc(id,name,jmembers)
+        def _create_tc(id, name, jmembers)
           begin
             CORBA::ORB._orb.create_exception_tc(id.to_s, name.to_s, jmembers)
           rescue ::NativeException
@@ -424,7 +423,7 @@ module R2CORBA
             @members = []
             def_inx = @tc_.default_index
             @tc_.member_count.times do |i|
-              if def_inx < 0  || def_inx != i
+              if def_inx < 0 || def_inx != i
                 ml_ = Any.from_java(@tc_.member_label(i))
               else
                 ml_ = :default
@@ -468,7 +467,7 @@ module R2CORBA
 
         protected
 
-        def _create_tc(id,name, disctc,jmembers)
+        def _create_tc(id, name, disctc, jmembers)
           begin
             CORBA::ORB._orb.create_union_tc(id.to_s, name.to_s, disctc.tc_, jmembers)
           rescue ::NativeException

data/lib/corba/jbase/Values.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/jbase/exception.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 # import all java CORBA exceptions into the R2CORBA::CORBA namespace
@@ -83,7 +82,7 @@ module R2CORBA
           self.set_backtrace(args.first.backtrace) if NativeException === args.first
         else
           super(args.shift.to_s)
-          @minor, @completed = (args + [0,0][args.size..2])
+          @minor, @completed = (args + [0, 0][args.size..2])
         end
       end
     end

data/lib/corba/jbase/poa.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
@@ -37,7 +36,7 @@ module R2CORBA
     module POA
       def destroy(etherealize_objects, wait_for_completion)
         begin
-          self.objref_.destroy(etherealize_objects!=false, wait_for_completion!=false)
+          self.objref_.destroy(etherealize_objects != false, wait_for_completion != false)
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
@@ -167,7 +166,7 @@ module R2CORBA
         raise CORBA::BAD_PARAM.new('expected POAManager', 0, CORBA::COMPLETED_NO) unless a_POAManager.is_a?(PortableServer::POAManager)
         CORBA::PolicyList._tc.validate(policies) unless policies.nil? || policies.empty?
         jpolicies = CORBA::Native::Reflect::Array.newInstance(CORBA::Native::Policy.java_class, policies.nil? ? 0 : policies.size)
-        policies.each_with_index {|p,i| jpolicies[i] = p.objref_ } unless policies.nil?
+        policies.each_with_index {|p, i| jpolicies[i] = p.objref_ } unless policies.nil?
         begin
           PortableServer::POA._narrow(CORBA::Object._wrap_native(self.objref_.create_POA(adapter_name, a_POAManager.objref_, jpolicies)))
         rescue ::NativeException
@@ -226,4 +225,4 @@ module R2CORBA
       end # get_state
     end # POAManager
   end
-end
+end

data/lib/corba/jbase/policies.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
@@ -17,7 +16,7 @@ module R2CORBA
 
     module ORB
       def create_policy(type, val)
-        raise CORBA::BAD_PARAM.new('Any expected',0,CORBA::COMPLETED_NO) unless CORBA::Any === val
+        raise CORBA::BAD_PARAM.new('Any expected', 0, CORBA::COMPLETED_NO) unless CORBA::Any === val
         begin
           Policy._wrap_native(self.orb_.create_policy(type.to_i, val.to_java(self.orb_)))
         rescue ::NativeException
@@ -59,7 +58,7 @@ module R2CORBA
       def _set_policy_overrides(policies, set_add)
         raise CORBA::INV_OBJREF.new if self._is_nil?()
         jpolicies = CORBA::Native::Reflect::Array.newInstance(CORBA::Native::Policy.java_class, policies.size)
-        policies.each_with_index {|e,i| jpolicies[i] = e.objref_ }
+        policies.each_with_index {|e, i| jpolicies[i] = e.objref_ }
         begin
           obj = self.objref_._set_policy_override(jpolicies, Native::SetOverrideType.from_int(set_add))
         rescue ::NativeException
@@ -126,7 +125,7 @@ module R2CORBA
 
       def set_policy_overrides(policies, set_add)
         jpolicies = CORBA::Native::Reflect::Array.newInstance(CORBA::Native::Policy.java_class, policies.size)
-        policies.each_with_index {|e,i| jpolicies[i] = e.objref_ }
+        policies.each_with_index {|e, i| jpolicies[i] = e.objref_ }
         begin
           self.objref_.set_policy_overrides(jpolicies, Native::SetOverrideType.from_int(set_add))
         rescue ::NativeException
@@ -297,4 +296,4 @@ module R2CORBA
 
   end # BiDirPolicy
 
-end # R2CORBA
+end # R2CORBA

data/lib/corba/jbase/post_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/jbase/IORMap'

data/lib/corba/jbase/require.rb

@@ -8,24 +8,26 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 require 'rbconfig'
 require 'java'
 
 module R2CORBA
-  if ENV['JACORB_HOME'] && File.exists?(File.join(ENV['JACORB_HOME'], 'lib', 'jacorb.jar'))
+  if ENV['JACORB_HOME'] &&
+      (File.exist?(File.join(ENV['JACORB_HOME'], 'lib', 'jacorb.jar')) ||
+       Dir[File.join(ENV['JACORB_HOME'], 'lib', 'jacorb-*.jar')].any? {|p| p =~ /\/jacorb\-\d\.\d\.jar\Z/})
     JACORB_HOME = ENV['JACORB_HOME']
   else
     # find jacorb.jar in library search path
-    JACORB_HOME = File.dirname(($:.find { |path| File.exists?(File.join(path, 'jacorb.jar')) }).to_s)
+    JACORB_HOME = File.dirname(($:.find { |path| Dir[File.join(path, 'jacorb-*.jar')].any? {|p| p =~ /\/jacorb(\.jar|\-\d\.\d\.jar)\Z/} }).to_s)
   end
 
   $LOAD_PATH << File.join(JACORB_HOME, 'lib')
   module JavaLang
     include_package 'java.lang'
-    prop = System.getProperties['java.endorsed.dirs']
-    System.setProperty('java.endorsed.dirs', "#{File.join(R2CORBA::JACORB_HOME, 'lib')}:#{prop}")
+    ## Only works if passed as Java commandline arg
+    # prop = System.getProperties['java.endorsed.dirs']
+    # System.setProperty('java.endorsed.dirs', "#{File.join(R2CORBA::JACORB_HOME, 'lib')}:#{prop}")
     System.setProperty('jacorb.home', "#{R2CORBA::JACORB_HOME}")
     System.setProperty('org.omg.CORBA.ORBClass', 'org.jacorb.orb.ORB')
     System.setProperty('org.omg.CORBA.ORBSingletonClass', 'org.jacorb.orb.ORBSingleton')

data/lib/corba/naming.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/CosNamingC'

data/lib/corba/naming_service.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/naming.rb'

data/lib/corba/poa.rb

@@ -8,8 +8,7 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'corba.rb'
-require "corba/#{defined?(JRUBY_VERSION)?'jbase':'cbase'}/poa.rb"
+require "corba/#{defined?(JRUBY_VERSION) ? 'jbase' : 'cbase'}/poa.rb"

data/lib/corba/policies.rb

@@ -8,11 +8,10 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'corba.rb'
 require 'corba/poa.rb'
 require 'corba/idl/BiDirPolicyC'
 require 'corba/idl/MessagingC'
-require "corba/#{defined?(JRUBY_VERSION)?'jbase':'cbase'}/policies.rb"
+require "corba/#{defined?(JRUBY_VERSION) ? 'jbase' : 'cbase'}/policies.rb"

data/lib/corba/require.rb

@@ -8,10 +8,9 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'corba/common/require'
-require "corba/#{defined?(JRUBY_VERSION)?'jbase':'cbase'}/require"
+require "corba/#{defined?(JRUBY_VERSION) ? 'jbase' : 'cbase'}/require"
 require 'corba/idl/require'
-require "corba/#{defined?(JRUBY_VERSION)?'jbase':'cbase'}/post_require"
+require "corba/#{defined?(JRUBY_VERSION) ? 'jbase' : 'cbase'}/post_require"

data/lib/corba/svcs/ins/cos_naming.rb

@@ -1,21 +1,18 @@
 #--------------------------------------------------------------------
 # cos_naming.rb - Implementation of CosNaming servants
-#                 for full featured naming service 
+#                 for full featured naming service
 #
 # Author: Martin Corino
 #
-# $Id: $
-#
 # 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
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'corba/naming_service'
-if (defined?(JRUBY_VERSION) or R2CORBA::TAO::RUBY_THREAD_SUPPORT)
+if defined?(JRUBY_VERSION) or R2CORBA::TAO::RUBY_THREAD_SUPPORT
   require 'monitor'
 end
 
@@ -29,12 +26,12 @@ module CosNaming
     # convert NameComponent to stringified format according to spec
     def to_string
       s = ''
-      s = self.r_id.gsub(/([\/\.\\])/,'\\\1') unless self.r_id.to_s.empty?
+      s = self.r_id.gsub(/([\/\.\\])/, '\\\1') unless self.r_id.to_s.empty?
       s << '.' if s.empty? or !self.kind.to_s.empty?
-      s << self.kind.gsub(/([\/\.\\])/,'\\\1') unless self.kind.to_s.empty?
+      s << self.kind.gsub(/([\/\.\\])/, '\\\1') unless self.kind.to_s.empty?
       s
     end
-    # convert stringified name back to NameComponent 
+    # convert stringified name back to NameComponent
     def self.from_string(snc)
       raise CosNaming::NamingContext::InvalidName.new if snc.empty?
       esc_ = false
@@ -46,9 +43,9 @@ module CosNaming
           esc_ = !esc_
         when '.'
           unless esc_
-            raise CosNaming::NamingContext::InvalidName.new if off_>0
+            raise CosNaming::NamingContext::InvalidName.new if off_ > 0
             id_ = snc[0, i].gsub(/\\(\.|\\)/, '\1')
-            off_ = i+1
+            off_ = i + 1
           end
           esc_ = false
         else
@@ -63,7 +60,7 @@ end
 
 module R2CORBA
   module INS
-    
+
     ##
     # Binding iterator servant class
     #
@@ -72,25 +69,25 @@ module R2CORBA
         @rl = reglist
         @id = iterator_id
       end
-    
+
       attr_accessor :oid
-    
+
       def next_one
         reg = @rl.shift
         [!reg.nil?, reg ? CosNaming::Binding.new(reg[:name], reg[:type]) : nil]
       end
-    
+
       def next_n(how_many)
         raise CORBA::BAD_PARAM.new if how_many < 1
         bindings = []
-        while how_many>0 and !@rl.empty?
+        while how_many > 0 and !@rl.empty?
           reg = @rl.shift
           bindings << CosNaming::Binding.new(reg[:name], reg[:type])
           how_many -= 1
         end
         [!bindings.empty?, bindings]
       end
-    
+
       def destroy
         poa = self._default_POA
         poa.deactivate_object(self.oid)
@@ -103,11 +100,11 @@ module R2CORBA
     # Naming context servant class
     #
     class NamingContext < POA::CosNaming::NamingContextExt
-      
+
       # Map type to store bindings.
       # Use synchronized version for multithreading capable implementations.
       #
-      if (defined?(JRUBY_VERSION) or R2CORBA::TAO::RUBY_THREAD_SUPPORT)
+      if defined?(JRUBY_VERSION) or R2CORBA::TAO::RUBY_THREAD_SUPPORT
         MAP_TYPE = Class.new(Monitor) do
           def initialize
             super
@@ -167,18 +164,18 @@ module R2CORBA
           end
         end
       end
-            
+
       @@iterators = MAP_TYPE.new
       @@iterator_max = 100
-      
+
       def self.set_iterator_max(max)
         @@iterator_max = max.to_i
       end
-      
+
       def self.clear_iterator(id)
-        @@iterators.delete(id) 
+        @@iterators.delete(id)
       end
-      
+
       def self.alloc_iterator(reglist)
         @@iterators.synchronize do
           unless @@iterators.size < @@iterator_max
@@ -189,64 +186,64 @@ module R2CORBA
           return (@@iterators[itid] = INS::BindingIterator.new(reglist, itid))
         end
       end
-      
+
       def initialize(orb)
-        @orb = orb        
+        @orb = orb
         @map = MAP_TYPE.new
       end
-    
+
       attr_accessor :oid
-    
+
       # CosNaming::NamingContext methods
       #
       def bind(n, obj)
-        raise CosNaming::NamingContext::InvalidName.new if n.size<1
-        if n.size>1
+        raise CosNaming::NamingContext::InvalidName.new if n.size < 1
+        if n.size > 1
           nc = find_context(n)
           nc.bind(n, obj)
         else
           register_object(n.first, n, CosNaming::Nobject, obj)
         end
       end
-    
+
       def rebind(n, obj)
-        raise CosNaming::NamingContext::InvalidName.new if n.size<1
-        if n.size>1
+        raise CosNaming::NamingContext::InvalidName.new if n.size < 1
+        if n.size > 1
           nc = find_context(n)
           nc.rebind(n, obj)
         else
           reregister_object(n.first, n, CosNaming::Nobject, obj)
         end
       end
-    
+
       def bind_context(n, nc_new)
-        raise CosNaming::NamingContext::InvalidName.new if n.size<1
-        if n.size>1
+        raise CosNaming::NamingContext::InvalidName.new if n.size < 1
+        if n.size > 1
           nc = find_context(n)
           nc.bind_context(n, nc_new)
         else
           register_object(n.first, n, CosNaming::Ncontext, nc_new)
         end
       end
-    
+
       def rebind_context(n, nc_new)
-        raise CosNaming::NamingContext::InvalidName.new if n.size<1
-        if n.size>1
+        raise CosNaming::NamingContext::InvalidName.new if n.size < 1
+        if n.size > 1
           nc = find_context(n)
           nc.rebind_context(n, nc_new)
         else
           reregister_object(n.first, n, CosNaming::Ncontext, nc_new)
         end
       end
-    
+
       def resolve(n)
-        raise CosNaming::NamingContext::InvalidName.new if n.size<1
+        raise CosNaming::NamingContext::InvalidName.new if n.size < 1
         find_object(n)
       end
-    
+
       def unbind(n)
-        raise CosNaming::NamingContext::InvalidName.new if n.size<1
-        if n.size>1
+        raise CosNaming::NamingContext::InvalidName.new if n.size < 1
+        if n.size > 1
           nc = find_context(n)
           nc.unbind(n)
         else
@@ -257,33 +254,33 @@ module R2CORBA
           end
         end
       end
-    
+
       def new_context()
         poa = self._default_POA
         naming_srv = NamingContext.new(@orb)
         naming_srv.oid = poa.activate_object(naming_srv)
         ::CosNaming::NamingContextExt::_narrow(poa.id_to_reference(naming_srv.oid))
       end
-    
+
       def bind_new_context(n)
-        raise CosNaming::NamingContext::InvalidName.new if n.size<1
+        raise CosNaming::NamingContext::InvalidName.new if n.size < 1
         nc = self.new_context()
         self.bind_context(n, nc)
         nc
       end
-    
+
       def destroy()
-        raise CosNaming::NamingContext::NotEmpty.new if @map.size>0
+        raise CosNaming::NamingContext::NotEmpty.new if @map.size > 0
         return if self.oid.nil? ## no oid for root context
         poa = self._default_POA
         poa.deactivate_object(self.oid)
         @orb = nil
       end
-    
+
       def list(how_many)
         reglist = @map.values
         bindings = []
-        while how_many>0 and !reglist.empty?
+        while how_many > 0 and !reglist.empty?
           reg = reglist.shift
           bindings << CosNaming::Binding.new(reg[:name], reg[:type])
           how_many -= 1
@@ -297,27 +294,27 @@ module R2CORBA
         end
         [bindings, CosNaming::BindingIterator._narrow(bi_obj)]
       end
-    
+
       # CosNaming::NamingContextExt methods
       #
       def to_string(n)
-        raise CosNaming::NamingContext::InvalidName.new if n.size<1
+        raise CosNaming::NamingContext::InvalidName.new if n.size < 1
         n.collect { |nc| nc.to_string }.join('/')
       end
-    
+
       def to_name(sn)
         raise CosNaming::NamingContext::InvalidName.new if sn.to_s.empty?
         snc_arr = []
         off_ = 0
         esc_ = false
         sn.size.times do |i|
-          case sn[i,1]
+          case sn[i, 1]
           when '\\'
-            esc_ = !esc_ 
+            esc_ = !esc_
           when '/'
             unless esc_
-              snc_arr << sn[off_, i-off_]
-              off_ = i+1
+              snc_arr << sn[off_, i - off_]
+              off_ = i + 1
             end
             esc_ = false
           else
@@ -327,10 +324,10 @@ module R2CORBA
         snc_arr << sn[off_, sn.size]
         [snc_arr.collect { |snc| CosNaming::NameComponent.from_string(snc) }]
       end
-    
+
       def to_url(addr, sn)
         raise CosNaming::NamingContext::InvalidName.new if addr.to_s.empty? or sn.to_s.empty?
-        url = 'corbaname:'+addr+'#'
+        url = 'corbaname:' + addr + '#'
         sn.scan(/./) do |ch|
           if /[a-zA-Z0-9;\/:\?@=+\$,\-_\.!~*\'\(\)]/ =~ ch
             url << ch
@@ -340,7 +337,7 @@ module R2CORBA
         end
         url
       end
-    
+
       def resolve_str(sn)
         self.resolve(self.to_name(sn).first)
       end
@@ -348,7 +345,7 @@ module R2CORBA
       # Helper methods
       #
       protected
-    
+
       # register the object reference for a certain NameComponent id
       # no reregistering or duplicates allowed
       #
@@ -363,7 +360,7 @@ module R2CORBA
           }
         end
       end
-    
+
       # reregister the object reference for a certain NameComponent id
       #
       def reregister_object(name, full_name, type, obj)
@@ -380,7 +377,7 @@ module R2CORBA
           }
         end
       end
-    
+
       # walk all segments of the given CosNaming::Name to find the object
       # bound by this full name
       # NOTE that #find_context is used when the Name contains > 1 level
@@ -388,7 +385,7 @@ module R2CORBA
       # resolving the context levels
       #
       def find_object(n)
-        if n.size>1
+        if n.size > 1
           nc = find_context(n)
           nc.resolve(n)
         else
@@ -400,7 +397,7 @@ module R2CORBA
           end
         end
       end
-    
+
       # check if there exists a naming context in the current context
       # with the id from the first segment of the given CosNaming::Name
       # return the object reference to the naming context if found
@@ -419,8 +416,8 @@ module R2CORBA
           @map[key_][:object]
         end
       end
-    
+
     end #of NamingContext servant
-    
+
   end
 end