You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@felix.apache.org by cz...@apache.org on 2014/09/13 15:47:55 UTC

svn commit: r1624738 - /felix/sandbox/http-rfc189/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/HttpContextManager.java

Author: cziegeler
Date: Sat Sep 13 13:47:55 2014
New Revision: 1624738

URL: http://svn.apache.org/r1624738
Log:
Apply FELIX-4597

Modified:
    felix/sandbox/http-rfc189/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/HttpContextManager.java

Modified: felix/sandbox/http-rfc189/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/HttpContextManager.java
URL: http://svn.apache.org/viewvc/felix/sandbox/http-rfc189/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/HttpContextManager.java?rev=1624738&r1=1624737&r2=1624738&view=diff
==============================================================================
--- felix/sandbox/http-rfc189/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/HttpContextManager.java (original)
+++ felix/sandbox/http-rfc189/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/HttpContextManager.java Sat Sep 13 13:47:55 2014
@@ -217,7 +217,8 @@ public final class HttpContextManager
         this.idMap.put(id, holder);
         this.contextMap.put(context, id);
 
-        return holder.getMappings();
+        // return a copy to prevent concurrent modification
+        return new HashSet<AbstractMapping>(holder.getMappings());
     }
 
     public synchronized Collection<AbstractMapping> addContextHelper(Bundle bundle, String contextName, String contextPath,