From 0a2627422901e24fe337a96589c5e97fc9481b34 Mon Sep 17 00:00:00 2001
From: seki <seki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 8 Nov 2004 14:38:58 +0000
Subject: add DRb::ExtServManager#uri=.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@7227 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog           | 6 ++++++
 lib/drb/extservm.rb | 8 +++++---
 test/drb/drbtest.rb | 3 +++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 13231b701..e5b61b63c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Nov  8 23:38:35 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/extservm.rb: add DRb::ExtServManager#uri=.
+	  [ruby-dev:24743]
+
+
 Mon Nov  8 22:20:19 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_class):
diff --git a/lib/drb/extservm.rb b/lib/drb/extservm.rb
index 50009dbae..b649c9c00 100644
--- a/lib/drb/extservm.rb
+++ b/lib/drb/extservm.rb
@@ -25,8 +25,9 @@ module DRb
       @waiting = []
       @queue = Queue.new
       @thread = invoke_thread
+      @uri = nil
     end
-    attr_reader :server
+    attr_accessor :uri
 
     def service(name)
       while true
@@ -84,10 +85,11 @@ module DRb
 	return if @servers.include?(name)
 	@servers[name] = false
       end
+      uri = @uri || DRb.uri
       if RUBY_PLATFORM =~ /mswin32/
-	system("cmd /c start /b #{command} #{DRb.uri} #{name}")
+	system("cmd /c start /b #{command} #{uri} #{name}")
       else
-	system("#{command} #{DRb.uri} #{name} &")
+	system("#{command} #{uri} #{name} &")
       end
     end
   end
diff --git a/test/drb/drbtest.rb b/test/drb/drbtest.rb
index 792cdcb7c..777f88fbe 100644
--- a/test/drb/drbtest.rb
+++ b/test/drb/drbtest.rb
@@ -4,6 +4,8 @@ require 'drb/extservm'
 require 'timeout'
 require 'rbconfig'
 
+DRb::DRbServer.new(nil)
+
 class DRbService
   @@manager = DRb::ExtServManager.new
   @@ruby = File.join(
@@ -17,6 +19,7 @@ class DRbService
     DRb::ExtServManager.command[nm] = "#{@@ruby} #{@@dir}/#{nm}"
   end
   @server = @@server = DRb::DRbServer.new(nil, @@manager, {})
+  @@manager.uri = @@server.uri
   def self.manager
     @@manager
   end
-- 
cgit