Avoid setting the timeout before we know which timeout we should set.

Signed-off-by: David Schmitt <david@dasz.at>

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb
index b2563e996..82d2d4533 100644
--- a/lib/puppet/util/settings.rb
+++ b/lib/puppet/util/settings.rb
@@ -308,13 +308,13 @@ class Puppet::Util::Settings
     def parse
         raise "No :config setting defined; cannot parse unknown config file" unless self[:config]
 
-        # Create a timer so that this file will get checked automatically
-        # and reparsed if necessary.
-        set_filetimeout_timer()
-
         @sync.synchronize do
             unsafe_parse(self[:config])
         end
+
+        # Create a timer so that this file will get checked automatically
+        # and reparsed if necessary.
+        set_filetimeout_timer()
     end
 
     # Unsafely parse the file -- this isn't thread-safe and causes plenty of problems if used directly.