[CHEF-4799] Handle non-dupable elements when duping attribute arrays

2 files changed, 16 insertions, 2 deletions

diff --git a/lib/chef/node/attribute_collections.rb b/lib/chef/node/attribute_collections.rb
index d5d496fd60..f09b02b106 100644
--- a/lib/chef/node/attribute_collections.rb
+++ b/lib/chef/node/attribute_collections.rb
@@ -76,8 +76,15 @@ class Chef
         super(data)
       end
 
+      # For elements like Fixnums, true, nil...
+      def safe_dup(e)
+        e.dup
+      rescue TypeError
+        e
+      end
+
       def dup
-        Array.new(map {|e| e.dup})
+        Array.new(map {|e| safe_dup(e)})
       end
 
     end
diff --git a/lib/chef/node/immutable_collections.rb b/lib/chef/node/immutable_collections.rb
index f5b3a5121d..63ac2b4c6b 100644
--- a/lib/chef/node/immutable_collections.rb
+++ b/lib/chef/node/immutable_collections.rb
@@ -85,8 +85,15 @@ class Chef
         METHOD_DEFN
       end
 
+      # For elements like Fixnums, true, nil...
+      def safe_dup(e)
+        e.dup
+      rescue TypeError
+        e
+      end
+
       def dup
-        Array.new(map {|e| e.dup })
+        Array.new(map {|e| safe_dup(e)})
       end
 
     end