From ce1f4733f3bb2d583ff96e410df0d775631f51c5 Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis@37signals.com>
Date: Tue, 10 Jul 2007 17:21:52 +0000
Subject: [PATCH] Allow execute_on_servers to be called without an active task
 again

git-svn-id: http://svn.rubyonrails.org/rails/tools/capistrano@7176 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 CHANGELOG                                   | 2 ++
 lib/capistrano/configuration/connections.rb | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 92a122fb..0b6f9cf6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Allow execute_on_servers to be called without a current task again [Jamis Buck]
+
 * Put $stdout in sync mode, so that Net::SSH prompts are displayed [Jamis Buck]
 
 * Make sure deploy:check aborts if it fails [Jamis Buck]
diff --git a/lib/capistrano/configuration/connections.rb b/lib/capistrano/configuration/connections.rb
index e9b9d772..26e6c663 100644
--- a/lib/capistrano/configuration/connections.rb
+++ b/lib/capistrano/configuration/connections.rb
@@ -115,7 +115,7 @@ module Capistrano
         begin
           establish_connections_to(servers)
         rescue ConnectionError => error
-          raise error unless task.continue_on_error?
+          raise error unless task && task.continue_on_error?
           error.hosts.each do |h|
             servers.delete(h)
             failed!(h)
@@ -125,7 +125,7 @@ module Capistrano
         begin
           yield servers
         rescue RemoteError => error
-          raise error unless task.continue_on_error?
+          raise error unless task && task.continue_on_error?
           error.hosts.each { |h| failed!(h) }
         end
       end