Supporting optional __default__ for waiters.

amazon-archives · Sep 11, 2014 · fe8e8b4 · fe8e8b4
1 parent 6ad605e
commit fe8e8b4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/aws-sdk-core/lib/aws/waiters/provider.rb b/aws-sdk-core/lib/aws/waiters/provider.rb
@@ -41,7 +41,7 @@ def resolve(definition)
         if extends = definition.delete('extends')
           resolve(@definitions[extends].merge(definition))
         else
-          @definitions['__default__'].merge(definition)
+          (@definitions['__default__'] || {}).merge(definition)
         end
       end