Repository: jclouds Updated Branches: refs/heads/master 22a8b9d04 -> 7588d2fba
Fixes potentially deleting a null server id. Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/7588d2fb Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/7588d2fb Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/7588d2fb Branch: refs/heads/master Commit: 7588d2fba401571098ef2fffc75321f53eb64c74 Parents: 22a8b9d Author: Zack Shoylev <[email protected]> Authored: Fri Mar 21 13:47:45 2014 -0500 Committer: Zack Shoylev <[email protected]> Committed: Fri Mar 21 15:13:44 2014 -0500 ---------------------------------------------------------------------- .../openstack/nova/v2_0/features/ServerApiLiveTest.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/7588d2fb/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ServerApiLiveTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ServerApiLiveTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ServerApiLiveTest.java index 3553d18..de53d3e 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ServerApiLiveTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ServerApiLiveTest.java @@ -88,7 +88,9 @@ public class ServerApiLiveTest extends BaseNovaApiLiveTest { Server server = serverApi.get(serverId); assertEquals(server.getStatus(), Server.Status.ACTIVE); } finally { - serverApi.delete(serverId); + if (serverId!=null) { + serverApi.delete(serverId); + } } } } @@ -133,7 +135,9 @@ public class ServerApiLiveTest extends BaseNovaApiLiveTest { Server server = serverApi.get(serverId); assertEquals(server.getStatus(), Server.Status.ERROR); } finally { - serverApi.delete(serverId); + if (serverId!=null) { + serverApi.delete(serverId); + } } } } @@ -168,7 +172,9 @@ public class ServerApiLiveTest extends BaseNovaApiLiveTest { assertEquals("fe80::100", rebuiltServer.getAccessIPv6()); } finally { - serverApi.delete(serverId); + if (serverId!=null) { + serverApi.delete(serverId); + } } } }
