From dcbf3c8689ed3eaed8653763ec27d2907671c72b Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Mon, 5 Dec 2016 16:45:33 +0530 Subject: [PATCH] CLOUDSTACK-9564: Fix NPE due to intermittent test assertion The test assertion on a pool object may return a null object, as objects can be randomly expired/tombstoned. This will fix a NPE sometimes seen due to recently merge for the fix for CLOUDSTACK-9564. Signed-off-by: Rohit Yadav --- .../com/cloud/hypervisor/vmware/util/VmwareContextPoolTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/vmware-base/test/com/cloud/hypervisor/vmware/util/VmwareContextPoolTest.java b/vmware-base/test/com/cloud/hypervisor/vmware/util/VmwareContextPoolTest.java index 5b8d47d0bb4..0c365db6fef 100644 --- a/vmware-base/test/com/cloud/hypervisor/vmware/util/VmwareContextPoolTest.java +++ b/vmware-base/test/com/cloud/hypervisor/vmware/util/VmwareContextPoolTest.java @@ -114,7 +114,5 @@ public class VmwareContextPoolTest { totalRegistrations += client.count(); } Mockito.verify(vmwareContextPool, Mockito.atLeast(totalRegistrations)).registerContext(Mockito.any(VmwareContext.class)); - Assert.assertEquals(vmwareContextPool.composePoolKey(vmwareAddress, vmwareUsername), - vmwareContextPool.getContext(vmwareAddress, vmwareUsername).getPoolKey()); } } \ No newline at end of file