svn commit: r1626115 - /synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/DynamicLoadbalanceEndpoint.java

[hiranya]

Author: hiranya
Date: Fri Sep 19 04:18:15 2014
New Revision: 1626115

URL: http://svn.apache.org/r1626115
Log:
Fixing SYNAPSE-933 Applying patch from Jeewantha with some changes

Modified:
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/DynamicLoadbalanceEndpoint.java

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/DynamicLoadbalanceEndpoint.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/DynamicLoadbalanceEndpoint.java?rev=1626115&r1=1626114&r2=1626115&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/DynamicLoadbalanceEndpoint.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/DynamicLoadbalanceEndpoint.java
 Fri Sep 19 04:18:15 2014
@@ -40,13 +40,7 @@ import org.apache.synapse.transport.nhtt
 
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
 
 /**
  * Represents a dynamic load balance endpoint. The application membership is 
not static,
@@ -462,7 +456,10 @@ public class DynamicLoadbalanceEndpoint 
             if (currentMember == null) {
                 return;
             }
-            synCtx.getFaultStack().pop(); // Remove the LoadbalanceFaultHandler
+            Stack faultStack = synCtx.getFaultStack();
+            if (!faultStack.empty()) {
+                faultStack.pop(); // Remove the LoadbalanceFaultHandler
+            }
             currentMember = 
lbMembershipHandler.getNextApplicationMember(algorithmContext);
             if(currentMember == null){
                 String msg = "No application members available";