From 90a6bab3346184bd1bd72427efb53656847cd3c6 Mon Sep 17 00:00:00 2001
From: Abhinandan Prateek <abhinandan.prateek@citrix.com>
Date: Tue, 6 Dec 2011 09:13:20 +0530
Subject: [PATCH] bug 12348: putting a better check on stopped states

---
 api/src/com/cloud/agent/api/ClusterSyncAnswer.java          | 1 +
 .../cloud/hypervisor/xen/resource/CitrixResourceBase.java   | 6 +++---
 server/src/com/cloud/server/auth/LDAPUserAuthenticator.java | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/api/src/com/cloud/agent/api/ClusterSyncAnswer.java b/api/src/com/cloud/agent/api/ClusterSyncAnswer.java
index 6da1aff460c..9c355da1f38 100644
--- a/api/src/com/cloud/agent/api/ClusterSyncAnswer.java
+++ b/api/src/com/cloud/agent/api/ClusterSyncAnswer.java
@@ -42,6 +42,7 @@ public class ClusterSyncAnswer extends Answer {
     public ClusterSyncAnswer(long clusterId, HashMap<String, Pair<String, State>> newStates){
         _clusterId = clusterId;
         _newStates = newStates;
+        _allStates = null;
         _type = DELTA_SYNC;
         result = true;
     }
diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index 12bce92d4c3..6c4f7d3835e 100755
--- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -6626,7 +6626,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
 
                 //check if host is changed
                 if (host_uuid != null && oldState != null){
-                    if (!host_uuid.equals(oldState.first())){
+                    if (!host_uuid.equals(oldState.first()) && newState != State.Stopped && newState != State.Stopping){
                         changes.put(vm, new Pair<String, State>(host_uuid, newState));
                         s_vms.put(_cluster, host_uuid, vm, newState);
                         continue;
@@ -6697,8 +6697,8 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
                 } else if (oldState == State.Migrating) {
                     s_logger.warn("Ignoring VM " + vm + " in migrating state.");
                 } else {
-                    State newState = State.Stopped;
-                    changes.put(vm, new Pair<String, State>(host_uuid, newState));
+                    //State newState = State.Stopped;
+                    //changes.put(vm, new Pair<String, State>(host_uuid, newState));
                 }
             }
         }
diff --git a/server/src/com/cloud/server/auth/LDAPUserAuthenticator.java b/server/src/com/cloud/server/auth/LDAPUserAuthenticator.java
index f653545a141..1cf3c41576f 100644
--- a/server/src/com/cloud/server/auth/LDAPUserAuthenticator.java
+++ b/server/src/com/cloud/server/auth/LDAPUserAuthenticator.java
@@ -89,7 +89,7 @@ public class LDAPUserAuthenticator extends DefaultUserAuthenticator {
             // substitute the queryFilter with this user info
             queryFilter = queryFilter.replaceAll("\\%u", username);
             queryFilter = queryFilter.replaceAll("\\%n", user.getFirstname() + " " + user.getLastname());
-            queryFilter = queryFilter.replaceAll("%e", user.getEmail());
+            queryFilter = queryFilter.replaceAll("\\%e", user.getEmail());
             
 
             SearchControls sc = new SearchControls();