git commit: updated refs/heads/4.4 to a7f1d00

[dahn]

Repository: cloudstack
Updated Branches:
  refs/heads/4.4 970ddd3a5 -> a7f1d002a


CLOUDSTACK-6923: updated listLBStickinessPolicies API to list using 
stickinesspolicy id

(cherry picked from commit b0d726a872e2859a56ee677c15079cc3a59ab894)

Conflicts:
        api/src/com/cloud/network/lb/LoadBalancingRulesService.java
        
api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java


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

Branch: refs/heads/4.4
Commit: a7f1d002a883a8b11d9ec263f6096ef7cab5d07e
Parents: 970ddd3
Author: Jayapal <jaya...@apache.org>
Authored: Tue Jun 17 16:14:33 2014 +0530
Committer: Daan Hoogland <d...@onecht.net>
Committed: Wed Jul 30 13:19:45 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/a7f1d002/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 6477621..80ae3eb 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());
         }