Repository: incubator-juneau Updated Branches: refs/heads/master e5184ac90 -> 6087b1120
Fix potential "java.util.concurrent.ConcurrentHashMap.keySet()Ljava/util/concurrent/ConcurrentHashMap$KeySetView" exception in MessageBundle when running under Java 8. Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/6087b112 Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/6087b112 Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/6087b112 Branch: refs/heads/master Commit: 6087b1120f734da6540b27b81bacd026c48f4680 Parents: e5184ac Author: jamesbognar <[email protected]> Authored: Wed Aug 3 15:00:53 2016 -0400 Committer: jamesbognar <[email protected]> Committed: Wed Aug 3 15:00:53 2016 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/juneau/utils/MessageBundle.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6087b112/org.apache.juneau/src/main/java/org/apache/juneau/utils/MessageBundle.java ---------------------------------------------------------------------- diff --git a/org.apache.juneau/src/main/java/org/apache/juneau/utils/MessageBundle.java b/org.apache.juneau/src/main/java/org/apache/juneau/utils/MessageBundle.java index c0feb2d..0d1ce75 100644 --- a/org.apache.juneau/src/main/java/org/apache/juneau/utils/MessageBundle.java +++ b/org.apache.juneau/src/main/java/org/apache/juneau/utils/MessageBundle.java @@ -51,7 +51,7 @@ public class MessageBundle extends ResourceBundle { // A map that contains all keys [shortKeyName->keyName] and [keyName->keyName], where shortKeyName // refers to keys prefixed and stripped of the class name (e.g. "foobar"->"MyClass.foobar") - private final ConcurrentHashMap<String,String> keyMap = new ConcurrentHashMap<String,String>(); + private final Map<String,String> keyMap = new ConcurrentHashMap<String,String>(); // Contains all keys present in all bundles in searchBundles. private final ConcurrentSkipListSet<String> allKeys = new ConcurrentSkipListSet<String>();
