cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject [2/2] git commit: updated refs/heads/4.4-forward to 66df435
Date Fri, 06 Jun 2014 00:43:36 GMT
CLOUDSTACK-6676: cleanup ip address details on ip disassoc


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/66df4357
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/66df4357
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/66df4357

Branch: refs/heads/4.4-forward
Commit: 66df43572e1a12ad2bd32f8c0aa9acaeb271828e
Parents: 03623fe
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Authored: Thu Jun 5 17:26:01 2014 -0700
Committer: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Committed: Thu Jun 5 17:26:01 2014 -0700

----------------------------------------------------------------------
 engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/66df4357/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java b/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java
index b569718..e1530ca 100755
--- a/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java
@@ -25,6 +25,7 @@ import javax.annotation.PostConstruct;
 import javax.ejb.Local;
 import javax.inject.Inject;
 
+import org.apache.cloudstack.resourcedetail.dao.UserIpAddressDetailsDao;
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
 
@@ -63,6 +64,8 @@ public class IPAddressDaoImpl extends GenericDaoBase<IPAddressVO, Long>
implemen
     protected GenericSearchBuilder<IPAddressVO, Long> CountFreePublicIps;
     @Inject
     ResourceTagDao _tagsDao;
+    @Inject
+    UserIpAddressDetailsDao _detailsDao;
 
     // make it public for JUnit test
     public IPAddressDaoImpl() {
@@ -166,6 +169,8 @@ public class IPAddressDaoImpl extends GenericDaoBase<IPAddressVO, Long>
implemen
         address.setSystem(false);
         address.setVmIp(null);
         address.setDisplay(true);
+        //remove resource details for the ip
+        _detailsDao.removeDetails(ipAddressId);
         update(ipAddressId, address);
     }
 


Mime
View raw message