describe_instance_attribute should not fail when an instance has a bl…

…ank UserData
flexera-public · Oct 25, 2011 · 584b7be · 584b7be
1 parent dc27231
commit 584b7be
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/ec2/right_ec2_instances.rb b/lib/ec2/right_ec2_instances.rb
@@ -347,7 +347,8 @@ def describe_instance_attribute(instance_id, attribute)
                               'InstanceId' => instance_id,
                               'Attribute'  => attribute)
       value = request_info(link, QEc2DescribeInstanceAttributeParser.new(:logger => @logger))
-      attribute == "userData" ? Base64.decode64(value) : value
+      value = Base64.decode64(value) if attribute == "userData" && !value.right_blank?
+      value
     rescue Exception
       on_exception
     end