Updated Branches: refs/heads/4.2 34582d672 -> 48e030589
CLOUDSTACK-3346: Fixed setting up resourceTags for network ACL - added missing @Inject when load NetworkACLItemDao Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/48e03058 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/48e03058 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/48e03058 Branch: refs/heads/4.2 Commit: 48e030589e55ca36cb2eb9a69edf9d1c24ff9e94 Parents: 34582d6 Author: Alena Prokharchyk <[email protected]> Authored: Mon Jul 15 10:19:22 2013 -0700 Committer: Alena Prokharchyk <[email protected]> Committed: Mon Jul 15 10:19:55 2013 -0700 ---------------------------------------------------------------------- server/src/com/cloud/tags/TaggedResourceManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e03058/server/src/com/cloud/tags/TaggedResourceManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/tags/TaggedResourceManagerImpl.java b/server/src/com/cloud/tags/TaggedResourceManagerImpl.java index f58c5d7..5f25499 100644 --- a/server/src/com/cloud/tags/TaggedResourceManagerImpl.java +++ b/server/src/com/cloud/tags/TaggedResourceManagerImpl.java @@ -121,6 +121,7 @@ public class TaggedResourceManagerImpl extends ManagerBase implements TaggedReso VMSnapshotDao _vmSnapshotDao; @Inject NicDao _nicDao; + @Inject NetworkACLItemDao _networkACLItemDao; @@ -139,7 +140,6 @@ public class TaggedResourceManagerImpl extends ManagerBase implements TaggedReso _daoMap.put(TaggedResourceType.PublicIpAddress, _publicIpDao); _daoMap.put(TaggedResourceType.Project, _projectDao); _daoMap.put(TaggedResourceType.Vpc, _vpcDao); - _daoMap.put(TaggedResourceType.NetworkACL, _firewallDao); _daoMap.put(TaggedResourceType.Nic, _nicDao); _daoMap.put(TaggedResourceType.NetworkACL, _networkACLItemDao); _daoMap.put(TaggedResourceType.StaticRoute, _staticRouteDao);
