aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--lib/drb/drb.rb13
2 files changed, 7 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 2280bd7a96..1dce588f2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Aug 8 16:34:22 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+
+ * lib/drb/drb.rb: removed unreachable code.
+
Fri Aug 8 14:33:49 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* lib/webrick/httpproxy.rb: remove needless condition
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
index ff1d3a53d3..25cf7e9c07 100644
--- a/lib/drb/drb.rb
+++ b/lib/drb/drb.rb
@@ -1594,16 +1594,9 @@ module DRb
end
- if RUBY_VERSION >= '1.8'
- require 'drb/invokemethod'
- class InvokeMethod
- include InvokeMethod18Mixin
- end
- else
- require 'drb/invokemethod16'
- class InvokeMethod
- include InvokeMethod16Mixin
- end
+ require 'drb/invokemethod'
+ class InvokeMethod
+ include InvokeMethod18Mixin
end
# The main loop performed by a DRbServer's internal thread.