felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1744257 - /felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/LoadBalancerCustomizerFactoryTracker.java
Date Tue, 17 May 2016 12:32:14 GMT
Author: cziegeler
Date: Tue May 17 12:32:14 2016
New Revision: 1744257

URL: http://svn.apache.org/viewvc?rev=1744257&view=rev
Log:
FELIX-5249 : Enabling SSL for org.apache.felix.http fails to properly restart the jetty service.
Apply patch from Krystian Nowak

Modified:
    felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/LoadBalancerCustomizerFactoryTracker.java

Modified: felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/LoadBalancerCustomizerFactoryTracker.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/LoadBalancerCustomizerFactoryTracker.java?rev=1744257&r1=1744256&r2=1744257&view=diff
==============================================================================
--- felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/LoadBalancerCustomizerFactoryTracker.java
(original)
+++ felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/LoadBalancerCustomizerFactoryTracker.java
Tue May 17 12:32:14 2016
@@ -80,10 +80,17 @@ public class LoadBalancerCustomizerFacto
 
         final ServiceReference<LoadBalancerCustomizerFactory> highestReference;
         synchronized (set)
-        {
-            set.remove(reference);
-            highestReference = set.last();
-        }
+		{
+			set.remove(reference);
+			if (set.isEmpty())
+			{
+				highestReference = null;
+			}
+			else
+			{
+				highestReference = set.last();
+			}
+		}
 
         boolean updated = false;
         if (highestReference != null)



Mime
View raw message