From a51ec1df1b1b206d854aab6c537387d43fe96788 Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.systems>
Date: Wed, 6 Mar 2019 16:59:59 +0100
Subject: [PATCH] Improves delete attribute in VirtualMachine.cc

(cherry picked from commit 908bf6a560b8f9d34d2f7914ba24fb9232ce5d87)
---
 src/vm/VirtualMachineAttribute.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/vm/VirtualMachineAttribute.cc b/src/vm/VirtualMachineAttribute.cc
index 73c6875f4e..9153f802a7 100644
--- a/src/vm/VirtualMachineAttribute.cc
+++ b/src/vm/VirtualMachineAttribute.cc
@@ -73,8 +73,9 @@ VirtualMachineAttribute * VirtualMachineAttributeSet::remove_attribute(
 
         if ( vma->is_flag(flag) == true )
         {
-            tmp = vma;
             a_set.erase(it);
+
+            return vma;
         }
     }