cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raj...@apache.org
Subject [1/2] git commit: updated refs/heads/master to 46a5f4b
Date Wed, 26 Aug 2015 10:26:43 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master f49928162 -> 46a5f4bc9


CLOUDSTACK-8773 : NPE in CheckRouterTask, when a DomainRouter happens to be expunged at the
same time


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

Branch: refs/heads/master
Commit: c162897aef157d2faea541c0287cc0866d8bdc51
Parents: 858b6c0
Author: Nick Livens <nick.livens@nuagenetworks.net>
Authored: Wed Aug 26 11:15:16 2015 +0200
Committer: Nick Livens <nick.livens@nuagenetworks.net>
Committed: Wed Aug 26 11:15:16 2015 +0200

----------------------------------------------------------------------
 engine/schema/src/com/cloud/vm/dao/DomainRouterDaoImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c162897a/engine/schema/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/vm/dao/DomainRouterDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
index 9f4d17a..c2d6dfe 100644
--- a/engine/schema/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
+++ b/engine/schema/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
@@ -23,6 +23,7 @@ import javax.annotation.PostConstruct;
 import javax.ejb.Local;
 import javax.inject.Inject;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Component;
 
 import com.cloud.host.HostVO;
@@ -252,7 +253,7 @@ public class DomainRouterDaoImpl extends GenericDaoBase<DomainRouterVO,
Long> im
         final List<DomainRouterVO> routerIds = listBy(sc);
         final List<DomainRouterVO> routers = new ArrayList<DomainRouterVO>();
         for (final DomainRouterVO router : routerIds) {
-            routers.add(findById(router.getId()));
+            CollectionUtils.addIgnoreNull(routers, findById(router.getId()));
         }
         return routers;
     }


Mime
View raw message