From fd1dbe96830e35a46f91af25a5db271d170f59a3 Mon Sep 17 00:00:00 2001
From: Chiradeep Vittal <chiradeep@cloud.com>
Date: Tue, 2 Aug 2011 13:51:26 -0700
Subject: [PATCH] bug 10884: do not lock if not necessary

---
 .../com/cloud/network/security/SecurityGroupManagerImpl.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
index bffecb4dfac..8b40666833a 100755
--- a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
+++ b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
@@ -374,6 +374,9 @@ public class SecurityGroupManagerImpl implements SecurityGroupManager, SecurityG
         if (s_logger.isTraceEnabled()) {
             s_logger.trace("Security Group Mgr: scheduling ruleset updates for " + affectedVms.size() + " vms");
         }
+        if (affectedVms.size() == 0) {
+            return;
+        }
         boolean locked = _workLock.lock(_globalWorkLockTimeout); 
         if (locked) {
             if (s_logger.isTraceEnabled()) {
@@ -382,7 +385,7 @@ public class SecurityGroupManagerImpl implements SecurityGroupManager, SecurityG
             try {
                 for (Long vmId : affectedVms) {
                     if (s_logger.isTraceEnabled()) {
-                        s_logger.trace("Security Group Mgr: scheduling ruleset updates for " + vmId);
+                        s_logger.trace("Security Group Mgr: scheduling ruleset update for " + vmId);
                     }
                     VmRulesetLogVO log = null;
                     SecurityGroupWorkVO work = null;