From a7f1d002a883a8b11d9ec263f6096ef7cab5d07e Mon Sep 17 00:00:00 2001
From: Jayapal <jayapal@apache.org>
Date: Tue, 17 Jun 2014 16:14:33 +0530
Subject: [PATCH] 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
---
 .../command/user/loadbalancer/ListLBStickinessPoliciesCmd.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 64776213019..80ae3ebed0f 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());
         }