r2corba 1.5.1-x64-mingw32 → 1.6.1-x64-mingw32

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (248) hide show
  1. checksums.yaml +5 -5
  2. data/LICENSE +5 -5
  3. data/README.rdoc +62 -0
  4. data/THANKS +4 -4
  5. data/lib/corba/cbase/IORMap.rb +0 -1
  6. data/lib/corba/cbase/ORB.rb +26 -24
  7. data/lib/corba/cbase/Request.rb +4 -5
  8. data/lib/corba/cbase/Streams.rb +2 -3
  9. data/lib/corba/cbase/Stub.rb +0 -1
  10. data/lib/corba/cbase/Typecode.rb +6 -7
  11. data/lib/corba/cbase/Values.rb +4 -3
  12. data/lib/corba/cbase/exception.rb +6 -5
  13. data/lib/corba/cbase/poa.rb +1 -2
  14. data/lib/corba/cbase/policies.rb +3 -4
  15. data/lib/corba/cbase/post_require.rb +1 -2
  16. data/lib/corba/cbase/require.rb +10 -2
  17. data/lib/corba/cmds/base.rb +1 -2
  18. data/lib/corba/cmds/test.rb +0 -1
  19. data/lib/corba/common/Any.rb +3 -3
  20. data/lib/corba/common/IDL.rb +6 -10
  21. data/lib/corba/common/ORB.rb +22 -23
  22. data/lib/corba/common/Object.rb +18 -15
  23. data/lib/corba/common/Request.rb +1 -2
  24. data/lib/corba/common/Servant.rb +4 -5
  25. data/lib/corba/common/Struct.rb +1 -2
  26. data/lib/corba/common/Stub.rb +6 -7
  27. data/lib/corba/common/Typecode.rb +91 -65
  28. data/lib/corba/common/Union.rb +6 -2
  29. data/lib/corba/common/Values.rb +2 -2
  30. data/lib/corba/common/const.rb +2 -3
  31. data/lib/corba/common/exception.rb +2 -2
  32. data/lib/corba/common/require.rb +8 -1
  33. data/lib/corba/common/version.rb +3 -4
  34. data/lib/corba/idl/BiDirPolicyC.rb +2 -3
  35. data/lib/corba/idl/CosNamingC.rb +4 -5
  36. data/lib/corba/idl/CosNamingS.rb +2 -3
  37. data/lib/corba/idl/IDL.rb +1 -2
  38. data/lib/corba/idl/IORTable.pidl +0 -1
  39. data/lib/corba/idl/IORTableC.rb +2 -3
  40. data/lib/corba/idl/MessagingC.rb +2 -3
  41. data/lib/corba/idl/POAC.rb +10 -11
  42. data/lib/corba/idl/TAO_Ext.pidl +0 -1
  43. data/lib/corba/idl/TAO_ExtC.rb +2 -3
  44. data/lib/corba/idl/r2c_orb.rb +5 -6
  45. data/lib/corba/idl/require.rb +0 -1
  46. data/lib/corba/jbase/Any.rb +29 -28
  47. data/lib/corba/jbase/IORMap.rb +1 -2
  48. data/lib/corba/jbase/ORB.rb +5 -6
  49. data/lib/corba/jbase/Object.rb +13 -14
  50. data/lib/corba/jbase/Request.rb +9 -10
  51. data/lib/corba/jbase/Servant.rb +11 -12
  52. data/lib/corba/jbase/ServerRequest.rb +8 -9
  53. data/lib/corba/jbase/Streams.rb +68 -5
  54. data/lib/corba/jbase/Stub.rb +0 -1
  55. data/lib/corba/jbase/Typecode.rb +17 -17
  56. data/lib/corba/jbase/Values.rb +2 -1
  57. data/lib/corba/jbase/exception.rb +2 -2
  58. data/lib/corba/jbase/poa.rb +21 -22
  59. data/lib/corba/jbase/policies.rb +33 -34
  60. data/lib/corba/jbase/post_require.rb +0 -1
  61. data/lib/corba/jbase/require.rb +5 -2
  62. data/lib/corba/naming.rb +0 -1
  63. data/lib/corba/naming_service.rb +0 -1
  64. data/lib/corba/poa.rb +1 -2
  65. data/lib/corba/policies.rb +1 -2
  66. data/lib/corba/require.rb +2 -3
  67. data/lib/corba/svcs/ins/cos_naming.rb +74 -68
  68. data/lib/corba/svcs/ins/ins.rb +58 -59
  69. data/lib/corba/svcs/ins/naming_service.rb +9 -10
  70. data/lib/corba.rb +1 -2
  71. data/lib/ridlbe/ruby/config.rb +78 -74
  72. data/lib/ridlbe/ruby/require.rb +0 -1
  73. data/lib/ridlbe/ruby/walker.rb +311 -288
  74. data/mkrf_conf_bingem.rb +4 -6
  75. data/rakelib/bin.rake +2 -3
  76. data/rakelib/bin.rb +4 -5
  77. data/rakelib/build.rake +22 -22
  78. data/rakelib/config.rake +2 -3
  79. data/rakelib/config.rb +32 -34
  80. data/rakelib/ext.rake +18 -77
  81. data/rakelib/ext.rb +19 -58
  82. data/rakelib/ext_r2tao.rb +33 -60
  83. data/rakelib/gem.rake +53 -38
  84. data/rakelib/gem.rb +9 -10
  85. data/rakelib/package.rake +2 -3
  86. data/rakelib/test.rake +0 -1
  87. data/test/BiDirectional/Test.idl +0 -1
  88. data/test/BiDirectional/client.rb +18 -19
  89. data/test/BiDirectional/run_test.rb +11 -12
  90. data/test/BiDirectional/server.rb +21 -23
  91. data/test/CORBA_Services/Naming/BindingIterator/Test.idl +0 -1
  92. data/test/CORBA_Services/Naming/BindingIterator/client.rb +17 -18
  93. data/test/CORBA_Services/Naming/BindingIterator/run_test.rb +13 -14
  94. data/test/CORBA_Services/Naming/BindingIterator/server.rb +19 -20
  95. data/test/CORBA_Services/Naming/Corbaname/Test.idl +0 -1
  96. data/test/CORBA_Services/Naming/Corbaname/client.rb +15 -16
  97. data/test/CORBA_Services/Naming/Corbaname/run_test.rb +13 -14
  98. data/test/CORBA_Services/Naming/Corbaname/server.rb +27 -28
  99. data/test/CORBA_Services/Naming/Simple/Test.idl +0 -1
  100. data/test/CORBA_Services/Naming/Simple/client.rb +16 -17
  101. data/test/CORBA_Services/Naming/Simple/run_test.rb +13 -14
  102. data/test/CORBA_Services/Naming/Simple/server.rb +19 -20
  103. data/test/Collocation/Diamond.idl +0 -1
  104. data/test/Collocation/run_test.rb +10 -11
  105. data/test/Collocation/test.rb +27 -21
  106. data/test/Connect_Timeout/Test.idl +0 -1
  107. data/test/Connect_Timeout/client.rb +16 -18
  108. data/test/Connect_Timeout/run_test.rb +10 -11
  109. data/test/DII/Test.idl +0 -1
  110. data/test/DII/client.rb +30 -31
  111. data/test/DII/run_test.rb +11 -12
  112. data/test/DII/server.rb +16 -17
  113. data/test/DSI/Test.idl +0 -1
  114. data/test/DSI/client.rb +16 -17
  115. data/test/DSI/run_test.rb +11 -12
  116. data/test/DSI/server.rb +17 -18
  117. data/test/Exceptions/Test.idl +0 -1
  118. data/test/Exceptions/client.rb +22 -23
  119. data/test/Exceptions/run_test.rb +11 -12
  120. data/test/Exceptions/server.rb +16 -17
  121. data/test/Hello/Test.idl +0 -1
  122. data/test/Hello/client.rb +16 -17
  123. data/test/Hello/run_test.rb +11 -12
  124. data/test/Hello/server.rb +17 -18
  125. data/test/IDL_Test/Test.idl +4 -1
  126. data/test/IDL_Test/client.rb +24 -23
  127. data/test/IDL_Test/run_test.rb +11 -12
  128. data/test/IDL_Test/server.rb +23 -19
  129. data/test/IORMap/Test.idl +0 -1
  130. data/test/IORMap/client.rb +14 -15
  131. data/test/IORMap/run_test.rb +11 -12
  132. data/test/IORMap/server.rb +23 -24
  133. data/test/IORTable/Test.idl +0 -1
  134. data/test/IORTable/client.rb +14 -15
  135. data/test/IORTable/run_test.rb +11 -12
  136. data/test/IORTable/server.rb +23 -24
  137. data/test/Implicit_Conversion/Test.idl +0 -1
  138. data/test/Implicit_Conversion/client.rb +20 -18
  139. data/test/Implicit_Conversion/run_test.rb +11 -12
  140. data/test/Implicit_Conversion/server.rb +16 -17
  141. data/test/Multi_Threading/Multiple_ORB/Test.idl +0 -1
  142. data/test/Multi_Threading/Multiple_ORB/client.rb +14 -15
  143. data/test/Multi_Threading/Multiple_ORB/run_test.rb +12 -13
  144. data/test/Multi_Threading/Multiple_ORB/server.rb +17 -18
  145. data/test/Multi_Threading/Simple/Test.idl +0 -1
  146. data/test/Multi_Threading/Simple/client.rb +17 -18
  147. data/test/Multi_Threading/Simple/run_test.rb +11 -12
  148. data/test/Multi_Threading/Simple/server.rb +17 -18
  149. data/test/Multi_Threading/Threads/Test.idl +0 -4
  150. data/test/Multi_Threading/Threads/client.rb +23 -26
  151. data/test/Multi_Threading/Threads/run_test.rb +11 -12
  152. data/test/Multi_Threading/Threads/server.rb +19 -22
  153. data/test/Multi_Threading/Threads/watchdog.rb +16 -16
  154. data/test/Multiple_Servant_Interfaces/Test.idl +0 -1
  155. data/test/Multiple_Servant_Interfaces/client.rb +14 -15
  156. data/test/Multiple_Servant_Interfaces/run_test.rb +11 -12
  157. data/test/Multiple_Servant_Interfaces/server.rb +18 -19
  158. data/test/Nil/Test.idl +0 -1
  159. data/test/Nil/run_test.rb +10 -11
  160. data/test/Nil/test.rb +22 -20
  161. data/test/OBV/AbstractInterface/client.rb +14 -15
  162. data/test/OBV/AbstractInterface/run_test.rb +11 -12
  163. data/test/OBV/AbstractInterface/server.rb +20 -20
  164. data/test/OBV/AbstractInterface/test.idl +0 -1
  165. data/test/OBV/Custom/OBV_impl.rb +2 -1
  166. data/test/OBV/Custom/client.rb +14 -15
  167. data/test/OBV/Custom/run_test.rb +11 -12
  168. data/test/OBV/Custom/server.rb +16 -17
  169. data/test/OBV/Simple/OBV_impl.rb +1 -1
  170. data/test/OBV/Simple/client.rb +14 -15
  171. data/test/OBV/Simple/run_test.rb +11 -12
  172. data/test/OBV/Simple/server.rb +16 -17
  173. data/test/OBV/Simple_Event/Event_impl.rb +1 -1
  174. data/test/OBV/Simple_Event/client.rb +14 -15
  175. data/test/OBV/Simple_Event/run_test.rb +11 -12
  176. data/test/OBV/Simple_Event/server.rb +16 -17
  177. data/test/OBV/Supports/client.rb +19 -20
  178. data/test/OBV/Supports/run_test.rb +11 -12
  179. data/test/OBV/Supports/server.rb +15 -16
  180. data/test/OBV/Supports/supports.idl +0 -1
  181. data/test/OBV/Supports/supports_impl.rb +3 -1
  182. data/test/OBV/Tree/client.rb +14 -15
  183. data/test/OBV/Tree/run_test.rb +11 -12
  184. data/test/OBV/Tree/server.rb +19 -20
  185. data/test/OBV/Tree/test.idl +0 -1
  186. data/test/OBV/Truncatable/Extra.idl +0 -1
  187. data/test/OBV/Truncatable/Truncatable_impl.rb +1 -2
  188. data/test/OBV/Truncatable/client.rb +57 -58
  189. data/test/OBV/Truncatable/run_test.rb +11 -12
  190. data/test/OBV/Truncatable/server.rb +15 -16
  191. data/test/OBV/ValueBox/client.rb +154 -154
  192. data/test/OBV/ValueBox/run_test.rb +11 -12
  193. data/test/OBV/ValueBox/server.rb +42 -42
  194. data/test/Object/Test.idl +0 -1
  195. data/test/Object/client.rb +15 -16
  196. data/test/Object/run_test.rb +11 -12
  197. data/test/Object/server.rb +19 -20
  198. data/test/POA/run_test.rb +10 -11
  199. data/test/POA/test.rb +17 -18
  200. data/test/Param_Test/client.rb +53 -54
  201. data/test/Param_Test/run_test.rb +11 -12
  202. data/test/Param_Test/server.rb +60 -61
  203. data/test/Performance/Simple/Test.idl +0 -1
  204. data/test/Performance/Simple/client.rb +16 -17
  205. data/test/Performance/Simple/run_test.rb +11 -12
  206. data/test/Performance/Simple/server.rb +16 -17
  207. data/test/Policies/Test.idl +0 -1
  208. data/test/Policies/run_test.rb +10 -11
  209. data/test/Policies/test.rb +23 -25
  210. data/test/Timeout/client.rb +21 -22
  211. data/test/Timeout/run_test.rb +11 -12
  212. data/test/Timeout/server.rb +19 -20
  213. data/test/Timeout/test.idl +0 -1
  214. data/test/lib/assert.rb +0 -2
  215. data/test/lib/test.rb +29 -25
  216. data/test/test_runner.rb +22 -24
  217. metadata +24 -52
  218. data/README +0 -62
  219. data/test/BiDirectional/server.ior +0 -1
  220. data/test/CORBA_Services/Naming/BindingIterator/ins.ior +0 -1
  221. data/test/CORBA_Services/Naming/Corbaname/corbaname.ior +0 -1
  222. data/test/CORBA_Services/Naming/Corbaname/ins.ior +0 -1
  223. data/test/CORBA_Services/Naming/Simple/ins.ior +0 -1
  224. data/test/DII/server.ior +0 -1
  225. data/test/DSI/server.ior +0 -1
  226. data/test/Exceptions/server.ior +0 -1
  227. data/test/IDL_Test/server.ior +0 -1
  228. data/test/IORMap/server.ior +0 -1
  229. data/test/IORTable/server.ior +0 -1
  230. data/test/Implicit_Conversion/server.ior +0 -1
  231. data/test/Multi_Threading/Multiple_ORB/server0.ior +0 -1
  232. data/test/Multi_Threading/Multiple_ORB/server1.ior +0 -1
  233. data/test/Multi_Threading/Simple/server.ior +0 -1
  234. data/test/Multi_Threading/Threads/server.ior +0 -1
  235. data/test/Multi_Threading/Threads/watchdog.ior +0 -1
  236. data/test/Multiple_Servant_Interfaces/server.ior +0 -1
  237. data/test/OBV/AbstractInterface/server.ior +0 -1
  238. data/test/OBV/Custom/server.ior +0 -1
  239. data/test/OBV/Simple/server.ior +0 -1
  240. data/test/OBV/Simple_Event/server.ior +0 -1
  241. data/test/OBV/Supports/server.ior +0 -1
  242. data/test/OBV/Tree/server.ior +0 -1
  243. data/test/OBV/Truncatable/server.ior +0 -1
  244. data/test/OBV/ValueBox/server.ior +0 -1
  245. data/test/Object/server.ior +0 -1
  246. data/test/Param_Test/server.ior +0 -1
  247. data/test/Performance/Simple/server.ior +0 -1
  248. data/test/Timeout/server.ior +0 -1
data/lib/corba/jbase/Request.rb CHANGED
@@ -8,7 +8,6 @@
8
8
  # included with this program.
9
9
  #
10
10
  # Copyright (c) Remedy IT Expertise BV
11
- # Chamber of commerce Rotterdam nr.276339, The Netherlands
12
11
  #--------------------------------------------------------------------
13
12
  module R2CORBA
14
13
  module CORBA
@@ -37,7 +36,7 @@ module R2CORBA
37
36
  end
38
37
  end
39
38
 
40
- def add_in_arg(tc, val, nm='')
39
+ def add_in_arg(tc, val, nm = '')
41
40
  begin
42
41
  self.req_.arguments.add_value(nm, Any.to_any(val, tc).to_java(self.req_.target._orb), CORBA::ARG_IN)
43
42
  rescue ::NativeException
@@ -46,7 +45,7 @@ module R2CORBA
46
45
  self.req_.arguments.count
47
46
  end
48
47
 
49
- def add_out_arg(tc, nm='')
48
+ def add_out_arg(tc, nm = '')
50
49
  begin
51
50
  self.req_.arguments.add_value(nm, Any.to_any(nil, tc).to_java(self.req_.target._orb), CORBA::ARG_OUT)
52
51
  rescue ::NativeException
@@ -55,7 +54,7 @@ module R2CORBA
55
54
  self.req_.arguments.count
56
55
  end
57
56
 
58
- def add_inout_arg(tc, val, nm='')
57
+ def add_inout_arg(tc, val, nm = '')
59
58
  begin
60
59
  self.req_.arguments.add_value(nm, Any.to_any(val, tc).to_java(self.req_.target._orb), CORBA::ARG_INOUT)
61
60
  rescue ::NativeException
@@ -89,7 +88,7 @@ module R2CORBA
89
88
  # clear current arguments
90
89
  begin
91
90
  nvl = self.req_.arguments
92
- nvl.remove(0) while nvl.count>0
91
+ nvl.remove(0) while nvl.count > 0
93
92
  rescue
94
93
  CORBA::Exception.native2r($!)
95
94
  end
@@ -121,7 +120,7 @@ module R2CORBA
121
120
  begin
122
121
  # clear current exceptions
123
122
  jexl = self.req_.exceptions
124
- jexl.remove(0) while jexl.count>0
123
+ jexl.remove(0) while jexl.count > 0
125
124
  # add new exceptions
126
125
  exl.each do |extc|
127
126
  jexl.add(extc.tc_)
@@ -162,7 +161,7 @@ module R2CORBA
162
161
  elsif jex.is_a?(CORBA::Native::UnknownUserException)
163
162
  CORBA::UserException._raise(jex)
164
163
  else
165
- raise CORBA::UNKNOWN.new(jex.getMessage(),0,CORBA::COMPLETED_MAYBE)
164
+ raise CORBA::UNKNOWN.new(jex.getMessage(), 0, CORBA::COMPLETED_MAYBE)
166
165
  end
167
166
  end
168
167
  self.result
@@ -208,12 +207,12 @@ module R2CORBA
208
207
  nvl = self.req_.arguments
209
208
  nvl.count.times do |i|
210
209
  nv = nvl.item(i)
211
- rc << Any.from_java(nv.value,self.req_.target._orb) unless nv.flags == CORBA::ARG_IN
210
+ rc << Any.from_java(nv.value, self.req_.target._orb) unless nv.flags == CORBA::ARG_IN
212
211
  end
213
212
  rescue
214
213
  CORBA::Exception.native2r($!)
215
214
  end
216
- if rc.size<2
215
+ if rc.size < 2
217
216
  return rc.shift
218
217
  else
219
218
  return *rc
@@ -223,4 +222,4 @@ module R2CORBA
223
222
  end
224
223
 
225
224
  end # CORBA
226
- end # R2CORBA
225
+ end # R2CORBA
data/lib/corba/jbase/Servant.rb CHANGED
@@ -8,7 +8,6 @@
8
8
  # included with this program.
9
9
  #
10
10
  # Copyright (c) Remedy IT Expertise BV
11
- # Chamber of commerce Rotterdam nr.276339, The Netherlands
12
11
  #--------------------------------------------------------------------
13
12
 
14
13
  module R2CORBA
@@ -40,7 +39,7 @@ module R2CORBA
40
39
 
41
40
  def invoke(jsrvreq)
42
41
  begin
43
- raise CORBA::NO_IMPLEMENT.new('',0,CORBA::COMPLETED_NO) unless @rsrv
42
+ raise CORBA::NO_IMPLEMENT.new('', 0, CORBA::COMPLETED_NO) unless @rsrv
44
43
  rsrvreq = CORBA::ServerRequest._wrap_native(jsrvreq, self._orb())
45
44
  begin
46
45
  case rsrvreq.srvreq_.operation()
@@ -81,9 +80,9 @@ module R2CORBA
81
80
  else
82
81
  STDERR.puts "#{ex_}\n#{ex_.backtrace.join("\n")}" unless $VERBOSE
83
82
  if jsrvreq.respond_to?(:setSystemException) # JacORB special
84
- jsrvreq.setSystemException(CORBA::Native::UNKNOWN.new("#{ex_}",0,CORBA::Native::CompletionStatus.from_int(CORBA::COMPLETED_MAYBE)))
83
+ jsrvreq.setSystemException(CORBA::Native::UNKNOWN.new("#{ex_}", 0, CORBA::Native::CompletionStatus.from_int(CORBA::COMPLETED_MAYBE)))
85
84
  else
86
- jsrvreq.set_exception(CORBA::Any.to_any(CORBA::UNKNOWN.new("#{ex_}",0,CORBA::COMPLETED_MAYBE)).to_java(self._orb()))
85
+ jsrvreq.set_exception(CORBA::Any.to_any(CORBA::UNKNOWN.new("#{ex_}", 0, CORBA::COMPLETED_MAYBE)).to_java(self._orb()))
87
86
  end
88
87
  end
89
88
  rescue CORBA::SystemException => ex_
@@ -97,9 +96,9 @@ module R2CORBA
97
96
  rescue Exception => ex_
98
97
  STDERR.puts "#{ex_}\n#{ex_.backtrace.join("\n")}"
99
98
  if jsrvreq.respond_to?(:setSystemException) # JacORB special
100
- jsrvreq.setSystemException(CORBA::Native::UNKNOWN.new("#{ex_}",0,CORBA::Native::CompletionStatus.from_int(CORBA::COMPLETED_MAYBE)))
99
+ jsrvreq.setSystemException(CORBA::Native::UNKNOWN.new("#{ex_}", 0, CORBA::Native::CompletionStatus.from_int(CORBA::COMPLETED_MAYBE)))
101
100
  else
102
- jsrvreq.set_exception(CORBA::Any.to_any(CORBA::UNKNOWN.new("#{ex_}",0,CORBA::COMPLETED_MAYBE)).to_java(self._orb()))
101
+ jsrvreq.set_exception(CORBA::Any.to_any(CORBA::UNKNOWN.new("#{ex_}", 0, CORBA::COMPLETED_MAYBE)).to_java(self._orb()))
103
102
  end
104
103
  end
105
104
  end
@@ -173,8 +172,8 @@ module R2CORBA
173
172
  opsym = alt_opsym if alt_opsym && alt_opsym.is_a?(Symbol)
174
173
  results = @rsrv.__send__(opsym, *rsrvreq.arguments)
175
174
  unless rsrvreq.result_type_.nil?
176
- result_value = (rsrvreq.arg_out_>0 ? results.shift : results) unless rsrvreq.result_type_.kind == CORBA::TK_VOID
177
- if rsrvreq.arg_out_>0
175
+ result_value = (rsrvreq.arg_out_ > 0 ? results.shift : results) unless rsrvreq.result_type_.kind == CORBA::TK_VOID
176
+ if rsrvreq.arg_out_ > 0
178
177
  rsrvreq.nvlist_.count().times do |i|
179
178
  jnv = rsrvreq.nvlist_.item(i)
180
179
  if [CORBA::ARG_OUT, CORBA::ARG_INOUT].include?(jnv.flags)
@@ -193,8 +192,8 @@ module R2CORBA
193
192
  def invoke_DSI(rsrvreq)
194
193
  results = @rsrv.invoke(rsrvreq)
195
194
  unless rsrvreq.result_type_.nil?
196
- result_value = (rsrvreq.arg_out_>0 ? results.shift : results) unless rsrvreq.result_type_.kind == CORBA::TK_VOID
197
- if rsrvreq.arg_out_>0
195
+ result_value = (rsrvreq.arg_out_ > 0 ? results.shift : results) unless rsrvreq.result_type_.kind == CORBA::TK_VOID
196
+ if rsrvreq.arg_out_ > 0
198
197
  rsrvreq.nvlist_.count().times do |i|
199
198
  jnv = rsrvreq.nvlist_.item(i)
200
199
  if [CORBA::ARG_OUT, CORBA::ARG_INOUT].include?(jnv.flags)
@@ -234,7 +233,7 @@ module R2CORBA
234
233
  # not in call context or not associated with ORB yet
235
234
  end
236
235
  end
237
- raise CORBA::BAD_INV_ORDER.new('no ORB initialized',0,CORBA::COMPLETED_NO) if CORBA::ORB._orb.nil?
236
+ raise CORBA::BAD_INV_ORDER.new('no ORB initialized', 0, CORBA::COMPLETED_NO) if CORBA::ORB._orb.nil?
238
237
  begin
239
238
  return CORBA::Object._wrap_native(self.srvref_._this_object(CORBA::ORB._orb))
240
239
  rescue ::NativeException
@@ -245,4 +244,4 @@ module R2CORBA
245
244
 
246
245
  end # PortableServer
247
246
 
248
- end # R2CORBA
247
+ end # R2CORBA
data/lib/corba/jbase/ServerRequest.rb CHANGED
@@ -8,7 +8,6 @@
8
8
  # included with this program.
9
9
  #
10
10
  # Copyright (c) Remedy IT Expertise BV
11
- # Chamber of commerce Rotterdam nr.276339, The Netherlands
12
11
  #--------------------------------------------------------------------
13
12
 
14
13
  module R2CORBA
@@ -53,12 +52,12 @@ module R2CORBA
53
52
  end
54
53
 
55
54
  def describe(opsig)
56
- raise CORBA::BAD_INV_ORDER.new('',0,CORBA::COMPLETED_NO) if @nvlist_
57
- raise CORBA::NO_IMPLEMENT.new('',0,CORBA::COMPLETED_NO) unless opsig && (Hash === opsig)
55
+ raise CORBA::BAD_INV_ORDER.new('', 0, CORBA::COMPLETED_NO) if @nvlist_
56
+ raise CORBA::NO_IMPLEMENT.new('', 0, CORBA::COMPLETED_NO) unless opsig && (Hash === opsig)
58
57
  @arg_list_ = opsig[:arg_list]
59
58
  @result_type_ = opsig[:result_type]
60
59
  @exc_list_ = opsig[:exc_list]
61
- raise CORBA::BAD_PARAM.new('',0,CORBA::COMPLETED_NO) unless (@arg_list_.nil? || @arg_list_.is_a?(Array)) &&
60
+ raise CORBA::BAD_PARAM.new('', 0, CORBA::COMPLETED_NO) unless (@arg_list_.nil? || @arg_list_.is_a?(Array)) &&
62
61
  (@result_type_.nil? || @result_type_.is_a?(CORBA::TypeCode)) &&
63
62
  (@exc_list_.nil? || @exc_list_.is_a?(Array))
64
63
  @nvlist_ = extract_arguments_(@arg_list_)
@@ -66,7 +65,7 @@ module R2CORBA
66
65
  end
67
66
 
68
67
  def arguments
69
- raise CORBA::BAD_INV_ORDER.new('',0,CORBA::COMPLETED_NO) unless @nvlist_
68
+ raise CORBA::BAD_INV_ORDER.new('', 0, CORBA::COMPLETED_NO) unless @nvlist_
70
69
  unless @arg_
71
70
  @arg_ = []
72
71
  @nvlist_.count().times do |i|
@@ -82,7 +81,7 @@ module R2CORBA
82
81
  self.arguments # make sure the @arg_ member has been initialized
83
82
  key = arg_index_from_name(key) if String === key
84
83
  key = key.to_i if key
85
- raise CORBA::BAD_PARAM.new('', 0, CORBA::COMPLETD_NO) unless key && (key>=0) && (key<@arg_.size)
84
+ raise CORBA::BAD_PARAM.new('', 0, CORBA::COMPLETD_NO) unless key && (key >= 0) && (key < @arg_.size)
86
85
  @arg_[key]
87
86
  end
88
87
 
@@ -90,7 +89,7 @@ module R2CORBA
90
89
  self.arguments # make sure the @arg_ member has been initialized
91
90
  key = arg_index_from_name(key) if String === key
92
91
  key = key.to_i if key
93
- raise CORBA::BAD_PARAM.new('', 0, CORBA::COMPLETD_NO) unless key && (key>=0) && (key<@arg_.size)
92
+ raise CORBA::BAD_PARAM.new('', 0, CORBA::COMPLETD_NO) unless key && (key >= 0) && (key < @arg_.size)
94
93
  jnv = @nvlist_.item(key)
95
94
  rtc = @arg_list_[key][2]
96
95
  CORBA::Any.to_any(val, rtc).to_java(self.orb_, jnv.value())
@@ -114,7 +113,7 @@ module R2CORBA
114
113
  unless arg_list.nil?
115
114
  arg_list.each do |argnm, argf, argtc|
116
115
  raise CORBA::BAD_PARAM.new('', 0, CORBA::COMPLETED_NO) if argf.nil? || argtc.nil? || !argtc.is_a?(CORBA::TypeCode)
117
- jnvlist.add_value(argnm.to_s, Any.to_any(nil,argtc).to_java(@orb_), argf.to_i)
116
+ jnvlist.add_value(argnm.to_s, Any.to_any(nil, argtc).to_java(@orb_), argf.to_i)
118
117
  end
119
118
  self.srvreq_.arguments(jnvlist)
120
119
  end
@@ -125,4 +124,4 @@ module R2CORBA
125
124
 
126
125
  end # CORBA
127
126
 
128
- end # R2CORBA
127
+ end # R2CORBA