diff options
Diffstat (limited to 'lib/chef/property.rb')
-rw-r--r-- | lib/chef/property.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/chef/property.rb b/lib/chef/property.rb index 6579eb06a8..1a3b8ec72c 100644 --- a/lib/chef/property.rb +++ b/lib/chef/property.rb @@ -89,9 +89,6 @@ class Chef options[:name_property] = options.delete(:name_attribute) if options.has_key?(:name_attribute) && !options.has_key?(:name_property) @options = options - if options.has_key?(:default) - options[:default] = options[:default].freeze - end options[:name] = options[:name].to_sym if options[:name] options[:instance_variable_name] = options[:instance_variable_name].to_sym if options[:instance_variable_name] end @@ -285,7 +282,7 @@ class Chef # If the value is mutable (non-frozen), we set it on the instance # so that people can mutate it. (All constant default values are # frozen.) - if !value.frozen? + if !value.frozen? && !value.nil? set_value(resource, value) end |