cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject git commit: updated refs/heads/4.4 to 861eff9
Date Tue, 24 Jun 2014 08:13:58 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.4 6b8b7b82f -> 861eff98d


CLOUDSTACK-6923: Fixed issue in lbsticlbsticlbrule with lbrule id

(cherry picked from commit a195e50ae7da4b4392844e2984823c1331ca1396)


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

Branch: refs/heads/4.4
Commit: 861eff98d0fb3af269d6c85f13acc0272ccf2dbf
Parents: 6b8b7b8
Author: Jayapal <jayapal@apache.org>
Authored: Tue Jun 24 10:35:34 2014 +0530
Committer: Daan Hoogland <daan@onecht.net>
Committed: Tue Jun 24 10:13:46 2014 +0200

----------------------------------------------------------------------
 .../api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/861eff98/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java
b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java
index 80ae3eb..6477621 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java
@@ -107,7 +107,7 @@ public class ListLBStickinessPoliciesCmd extends BaseListCmd {
             }
         }
 
-        if (lbRuleId != null && lb != null) {
+        if (lbRuleId != null && lb == null) {
             lb = _lbService.findById(getLbRuleId());
         }
 


Mime
View raw message