[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.1rc1-141-gcdb2b90

[Markus Roberts]

The following commit has been merged in the upstream branch:
commit ef9a4a6df163c370a524d9ab76453c96bb99e8a4
Author: Brice Figureau <brice-puppet at daysofwonder.com>
Date:   Sun Jul 25 19:19:04 2010 +0200

    Fix #4245 - default insertion of ACL is not thread safe
    
    This can happen under jruby with native threads.
    
    Signed-off-by: Brice Figureau <brice-puppet at daysofwonder.com>

diff --git a/lib/puppet/network/rest_authconfig.rb b/lib/puppet/network/rest_authconfig.rb
index 38a8f9a..82d5a9d 100644
--- a/lib/puppet/network/rest_authconfig.rb
+++ b/lib/puppet/network/rest_authconfig.rb
@@ -3,6 +3,7 @@ require 'puppet/network/authconfig'
 module Puppet
   class Network::RestAuthConfig < Network::AuthConfig
 
+    extend MonitorMixin
     attr_accessor :rights
 
     DEFAULT_ACL = [
@@ -20,9 +21,11 @@ module Puppet
     ]
 
     def self.main
-      add_acl = @main.nil?
-      super
-      @main.insert_default_acl if add_acl and !@main.exists?
+      synchronize do
+        add_acl = @main.nil?
+        super
+        @main.insert_default_acl if add_acl and !@main.exists?
+      end
       @main
     end
 

-- 
Puppet packaging for Debian