From 0b416dcbacf4715703b5527914ba4650f0ac3ff0 Mon Sep 17 00:00:00 2001
From: Alejandro Huertas Herrero <ahuertas@opennebula.systems>
Date: Sat, 26 Jan 2019 00:44:47 +0100
Subject: [PATCH] B #2849: Fix detach nic when onegate token is set. (#2850)

---
 src/vmm/VirtualMachineManager.cc | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/vmm/VirtualMachineManager.cc b/src/vmm/VirtualMachineManager.cc
index 716c9fbcf7..9d275ebc18 100644
--- a/src/vmm/VirtualMachineManager.cc
+++ b/src/vmm/VirtualMachineManager.cc
@@ -2420,6 +2420,19 @@ void VirtualMachineManager::detach_nic_action(
         return;
     }
 
+    int uid = vm->get_created_by_uid();
+    int owner_id = vm->get_uid();
+    vm->unlock();
+
+    password = Nebula::instance().get_upool()->get_token_password(uid, owner_id);
+
+    vm = vmpool->get(vid);
+
+    if (vm == 0)
+    {
+        return;
+    }
+
     if (!vm->hasHistory())
     {
         goto error_history;