You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2014/11/25 20:05:10 UTC
[14/20] git commit: updated refs/heads/4.3 to 67df5b9
CLOUDSTACK-6376: Return empty list when network tier has no ACL list associated.
(cherry picked from commit 26746feb39da6483059be7b33a2d5cd41f042c78)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7b7eb482
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7b7eb482
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7b7eb482
Branch: refs/heads/4.3
Commit: 7b7eb48281ed79dab7cabb512554b05ec7ae6da2
Parents: 5ac4489
Author: Kishan Kavala <ki...@cloud.com>
Authored: Tue Mar 4 11:18:09 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Tue Nov 25 23:17:58 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/7b7eb482/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 37f1c39..28d8776 100644
--- a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
+++ b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
@@ -515,6 +515,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) {