Merge branch 'master' into leap

1 files changed, 7 insertions, 7 deletions

diff --git a/lib/puppet/parser/functions/delete_undef_values.rb b/lib/puppet/parser/functions/delete_undef_values.rb
index 4eecab2..f94d4da 100644
--- a/lib/puppet/parser/functions/delete_undef_values.rb
+++ b/lib/puppet/parser/functions/delete_undef_values.rb
@@ -3,7 +3,7 @@ module Puppet::Parser::Functions
 Returns a copy of input hash or array with all undefs deleted.
 
 *Examples:*
-    
+
     $hash = delete_undef_values({a=>'A', b=>'', c=>undef, d => false})
 
 Would return: {a => 'A', b => '', d => false}
@@ -11,7 +11,7 @@ Would return: {a => 'A', b => '', d => false}
     $array = delete_undef_values(['A','',undef,false])
 
 Would return: ['A','',false]
-    
+
       EOS
     ) do |args|
 
@@ -19,15 +19,15 @@ Would return: ['A','',false]
           "delete_undef_values(): Wrong number of arguments given " +
           "(#{args.size})") if args.size < 1
 
-    result = args[0]
+    unless args[0].is_a? Array or args[0].is_a? Hash
+      raise(Puppet::ParseError,
+            "delete_undef_values(): expected an array or hash, got #{args[0]} type  #{args[0].class} ")
+    end
+    result = args[0].dup
     if result.is_a?(Hash)
       result.delete_if {|key, val| val.equal? :undef}
     elsif result.is_a?(Array)
       result.delete :undef
-    else
-      raise(Puppet::ParseError, 
-            "delete_undef_values(): Wrong argument type #{args[0].class} " +
-            "for first argument")
     end
     result
   end