1 files changed, 24 insertions, 1 deletions
diff --git a/lib/chef/mixin/params_validate.rb b/lib/chef/mixin/params_validate.rb
index 1f335f6722..322caea474 100644
--- a/lib/chef/mixin/params_validate.rb
+++ b/lib/chef/mixin/params_validate.rb
@@ -119,7 +119,7 @@ class Chef
       end
 
       def set_or_return(symbol, value, validation)
-        property = Property::NonDeprecatedNilGetter.new(name: symbol, **validation)
+        property = SetOrReturnProperty.new(name: symbol, **validation)
         property.call(self, value)
       end
 
@@ -441,6 +441,29 @@ class Chef
           opts[key.to_sym] = instance_exec(opts[key], &coercer)
         end
       end
+
+      # Used by #set_or_return to avoid emitting a deprecation warning for
+      # "value nil" and to keep default stickiness working exactly the same
+      # @api private
+      class SetOrReturnProperty < Chef::Property
+        def get(resource)
+          value = super
+          # All values are sticky, frozen or not
+          if !is_set?(resource)
+            set_value(resource, value)
+          end
+          value
+        end
+
+        def call(resource, value=NOT_PASSED)
+          # setting to nil does a get
+          if value.nil? && !explicitly_accepts_nil?(resource)
+            get(resource)
+          else
+            super
+          end
+        end
+      end
     end
   end
 end