From 49ccacc8cb1395ee8f0960deb0448a143e540c5d Mon Sep 17 00:00:00 2001
From: Marek Goldmann <marek.goldmann@gmail.com>
Date: Tue, 8 Jul 2014 10:54:51 +0200
Subject: [PATCH] JDK 8 support

---
 .../cxf/configuration/spring/AbstractSpringBeanMap.java      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/api/src/main/java/org/apache/cxf/configuration/spring/AbstractSpringBeanMap.java b/api/src/main/java/org/apache/cxf/configuration/spring/AbstractSpringBeanMap.java
index 9495d9a..bcbcd94 100644
--- a/api/src/main/java/org/apache/cxf/configuration/spring/AbstractSpringBeanMap.java
+++ b/api/src/main/java/org/apache/cxf/configuration/spring/AbstractSpringBeanMap.java
@@ -167,11 +167,11 @@ abstract class AbstractSpringBeanMap<X, V>
         return idToBeanName.isEmpty() && putStore.isEmpty();
     }
 
-    public Set<X> keySet() {
-        Set<X> keys = new LinkedHashSet<X>();
-        keys.addAll(putStore.keySet());
-        keys.addAll(idToBeanName.keySet());
-        return keys;
+    public ConcurrentHashMap.KeySetView<X,V> keySet() {
+        ConcurrentHashMap.KeySetView keySetView = ConcurrentHashMap.newKeySet();
+        keySetView.addAll(putStore.keySet());
+        keySetView.addAll(idToBeanName.keySet());
+        return keySetView;
     }
 
     public V put(X key, V value) {
@@ -258,7 +258,7 @@ abstract class AbstractSpringBeanMap<X, V>
             return AbstractSpringBeanMap.this.isEmpty();
         }
 
-        public Set<X> keySet() {
+        public ConcurrentHashMap.KeySetView<X,V> keySet() {
             return AbstractSpringBeanMap.this.keySet();
         }
 
-- 
1.9.3