From 2b188b37dd740739212470f9fdc76519e4cccada Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Fri, 18 Mar 2011 16:43:26 -0700
Subject: [PATCH] fixed start management server

---
 patches/systemvm/debian/config/etc/init.d/cloud-early-config | 2 +-
 server/src/com/cloud/storage/dao/SnapshotDaoImpl.java        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-early-config b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
index 7b402ec6755..39798393175 100755
--- a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
+++ b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
@@ -99,7 +99,7 @@ patch() {
     local newmd5=
     [ -f ${patchfile} ] && newmd5=$(md5sum ${patchfile} | awk '{print $1}')
  
-   if [ "$oldmd5" != "$newmd5" ] && [ -f ${patchfile} ] && [ "$newmd5" != "" ]
+   if [ "true" == "true" ]
     then
       shouldpatch=true
       log_it "Patching  scripts oldmd5=$oldmd5 newmd5=$newmd5"
diff --git a/server/src/com/cloud/storage/dao/SnapshotDaoImpl.java b/server/src/com/cloud/storage/dao/SnapshotDaoImpl.java
index ba4773f4970..fce66e1c66f 100644
--- a/server/src/com/cloud/storage/dao/SnapshotDaoImpl.java
+++ b/server/src/com/cloud/storage/dao/SnapshotDaoImpl.java
@@ -115,8 +115,8 @@ public class SnapshotDaoImpl extends GenericDaoBase<SnapshotVO, Long> implements
         VolumeIdTypeSearch.done();
         
         VolumeIdVersionSearch = createSearchBuilder();
-        VolumeIdVersionSearch.and("volumeId", VolumeIdTypeSearch.entity().getVolumeId(), SearchCriteria.Op.EQ);
-        VolumeIdVersionSearch.and("version", VolumeIdTypeSearch.entity().getVersion(), SearchCriteria.Op.EQ);
+        VolumeIdVersionSearch.and("volumeId", VolumeIdVersionSearch.entity().getVolumeId(), SearchCriteria.Op.EQ);
+        VolumeIdVersionSearch.and("version", VolumeIdVersionSearch.entity().getVersion(), SearchCriteria.Op.EQ);
         VolumeIdVersionSearch.done();
         
         ParentIdSearch = createSearchBuilder();