Deal with bad executor early

ruby-concurrency · Dec 23, 2016 · 399d276 · 399d276
1 parent 41cf14d
commit 399d276
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/lib/concurrent/actor.rb b/lib/concurrent/actor.rb
@@ -65,10 +65,14 @@ def self.root
     # @param args see {.to_spawn_options}
     # @return [Reference] never the actual actor
     def self.spawn(*args, &block)
+      options = to_spawn_options(*args)
+      if options[:executor] && options[:executor].is_a?(ImmediateExecutor)
+        raise ArgumentError, 'ImmediateExecutor is not supported'
+      end
       if Actor.current
-        Core.new(to_spawn_options(*args).merge(parent: Actor.current), &block).reference
+        Core.new(options.merge(parent: Actor.current), &block).reference
       else
-        root.ask([:spawn, to_spawn_options(*args), block]).value!
+        root.ask([:spawn, options, block]).value!
       end
     end
 

diff --git a/lib/concurrent/actor/core.rb b/lib/concurrent/actor/core.rb
@@ -172,7 +172,6 @@ def ns_initialize(opts, &block)
         allocate_context
 
         @executor = Type! opts.fetch(:executor, @context.default_executor), Concurrent::AbstractExecutorService
-        raise ArgumentError, 'ImmediateExecutor is not supported' if @executor.is_a? ImmediateExecutor
 
         @reference = (Child! opts[:reference_class] || @context.default_reference_class, Reference).new self
         @name      = (Type! opts.fetch(:name), String, Symbol).to_s