Rework awkward if statement

vmware-archive · Jan 31, 2014 · 6a99827 · 6a99827
1 parent 571433c
commit 6a99827
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/lib/rbvmomi/deserialization.rb b/lib/rbvmomi/deserialization.rb
@@ -42,10 +42,11 @@ def initialize conn
   end
 
   def deserialize node, type=nil
-    if type_attr = node['type']
-    elsif node.attributes['type']
-      # Work around for 1.5.x which doesn't populate node['type']
-      # XXX what changed
+    type_attr = node['type']
+
+    # Work around for 1.5.x which doesn't populate node['type']
+    # XXX what changed
+    if node.attributes['type'] and not type_attr
       type_attr = node.attributes['type'].value
     end