summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/network/client/master.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/puppet/network/client/master.rb b/lib/puppet/network/client/master.rb
index 2b9490539..ae13f8185 100644
--- a/lib/puppet/network/client/master.rb
+++ b/lib/puppet/network/client/master.rb
@@ -108,7 +108,7 @@ class Puppet::Network::Client::Master < Puppet::Network::Client
end
def clear
- @objects.remove(true)
+ @objects.remove(true) if @objects
Puppet::Type.allclear
mkdefault_objects
@objects = nil
@@ -325,6 +325,7 @@ class Puppet::Network::Client::Master < Puppet::Network::Client
ensure
# Just make sure we remove the lock file if we set it.
lockfile.unlock if got_lock and lockfile.locked?
+ clear()
end
def running?