From 9d76f6d719e3c8bc6eedac5b4fd66d055183b5ef Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Thu, 23 Jun 2011 19:59:14 -0700
Subject: [PATCH] Always add default security group when deploy vm in basic
 zone

---
 server/src/com/cloud/vm/UserVmManagerImpl.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 8750654a02c..3740342115f 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -2033,8 +2033,10 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
         
         if (securityGroupIdList != null && isVmWare) {
             throw new InvalidParameterValueException("Security group feature is not supported for vmWare hypervisor");
-        } else if (securityGroupIdList == null && !isVmWare) {
-            securityGroupIdList = new ArrayList<Long>();
+        } else if (!isVmWare) {
+            if (securityGroupIdList == null) {
+                securityGroupIdList = new ArrayList<Long>();
+            }
             SecurityGroup defaultGroup = _securityGroupMgr.getDefaultSecurityGroup(owner.getId());
             if (defaultGroup != null) {
               //check if security group id list already contains Default security group, and if not - add it