cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kis...@apache.org
Subject [3/3] git commit: updated refs/heads/master to 26746fe
Date Thu, 10 Apr 2014 09:58:26 GMT
CLOUDSTACK-6376: Return empty list when network tier has no ACL list associated.


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

Branch: refs/heads/master
Commit: 26746feb39da6483059be7b33a2d5cd41f042c78
Parents: 16ab5ce
Author: Kishan Kavala <kishan@cloud.com>
Authored: Tue Mar 4 11:18:09 2014 +0530
Committer: Kishan Kavala <kishan@cloud.com>
Committed: Thu Apr 10 14:45:15 2014 +0530

----------------------------------------------------------------------
 server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26746feb/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
index d2aa617..72996d1 100644
--- a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
+++ b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
@@ -532,6 +532,11 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ
         if (networkId != null) {
             Network network = _networkDao.findById(networkId);
             aclId = network.getNetworkACLId();
+            if( aclId == null){
+                // No aclId associated with the network.
+                //Return empty list
+                return new Pair(new ArrayList<NetworkACLItem>(), 0);
+            }
         }
 
         if (trafficType != null) {


Mime
View raw message