cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From weiz...@apache.org
Subject git commit: updated refs/heads/4.4 to b55c114
Date Fri, 15 Aug 2014 07:52:44 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.4 f41019d5b -> b55c11493


CLOUDSTACK-7308: tags for security group rules (additional commit for 4.4)


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

Branch: refs/heads/4.4
Commit: b55c114932a661406deb0478494948a0480a4964
Parents: f41019d
Author: Wei Zhou <w.zhou@leaseweb.com>
Authored: Fri Aug 15 09:51:39 2014 +0200
Committer: Wei Zhou <w.zhou@leaseweb.com>
Committed: Fri Aug 15 09:51:39 2014 +0200

----------------------------------------------------------------------
 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/b55c1149/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 55742b8..64474ec 100644
--- a/server/src/com/cloud/tags/TaggedResourceManagerImpl.java
+++ b/server/src/com/cloud/tags/TaggedResourceManagerImpl.java
@@ -202,7 +202,7 @@ public class TaggedResourceManagerImpl extends ManagerBase implements
TaggedReso
             accountId = Account.ACCOUNT_ID_SYSTEM;
         }
 
-        if ( ((accountId != null) && (domainId == -1)) || (domainId == null) )
+        if ((domainId == null) || ((accountId != null) && (domainId.longValue() ==
-1)))
         {
             domainId = _accountDao.getDomainIdForGivenAccountId(accountId);
         }


Mime
View raw message