cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From weiz...@apache.org
Subject [1/3] git commit: updated refs/heads/master to fc1a09f
Date Thu, 04 Dec 2014 14:32:45 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 7b8fe0c8c -> fc1a09ff4


fix NPE when delete a domain


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

Branch: refs/heads/master
Commit: d4605556c620f0475263a339ea4f646817bfaad5
Parents: 7b8fe0c
Author: Wei Zhou <w.zhou@tech.leaseweb.com>
Authored: Thu Dec 4 15:28:41 2014 +0100
Committer: Wei Zhou <w.zhou@tech.leaseweb.com>
Committed: Thu Dec 4 15:28:41 2014 +0100

----------------------------------------------------------------------
 server/src/com/cloud/network/rules/RulesManagerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d4605556/server/src/com/cloud/network/rules/RulesManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/rules/RulesManagerImpl.java b/server/src/com/cloud/network/rules/RulesManagerImpl.java
index 56a075d..c46260d 100644
--- a/server/src/com/cloud/network/rules/RulesManagerImpl.java
+++ b/server/src/com/cloud/network/rules/RulesManagerImpl.java
@@ -1374,7 +1374,7 @@ public class RulesManagerImpl extends ManagerBase implements RulesManager,
Rules
             throw new CloudRuntimeException("Ip address is not associated with any network");
         }
 
-        VMInstanceVO vm = _vmInstanceDao.findById(sourceIp.getAssociatedWithVmId());
+        VMInstanceVO vm = _vmInstanceDao.findByIdIncludingRemoved(sourceIp.getAssociatedWithVmId());
         Network network = _networkModel.getNetwork(networkId);
         if (network == null) {
             CloudRuntimeException ex = new CloudRuntimeException("Unable to find an ip address
to map to specified vm id");


Mime
View raw message