MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

allow V8 map on IBM JDK 1.7

Browse Source
This commit is contained in:
Eugene Zhuravlev
2013-11-29 21:55:03 +01:00
parent 1f08bb4fb1
commit 3c82358b97
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/util/src/com/intellij/util/containers/ConcurrentMapFactory.java
+7 -1
View File
@@ -16,6 +16,7 @@
package com.intellij.util.containers;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.text.StringUtil;
import gnu.trove.TObjectHashingStrategy;
import org.jetbrains.annotations.NotNull;
@@ -79,7 +80,12 @@ public abstract class ConcurrentMapFactory {
}
};
private static final ConcurrentMapFactory DEFAULT_FACTORY = SystemInfo.isOracleJvm || SystemInfo.isAppleJvm? V8_MAP_FACTORY : PLATFORM_MAP_FACTORY;
private static final ConcurrentMapFactory DEFAULT_FACTORY = SystemInfo.isOracleJvm || SystemInfo.isAppleJvm || isAtLeastJava7() ? V8_MAP_FACTORY : PLATFORM_MAP_FACTORY;
private static boolean isAtLeastJava7() {
// IBM JDK provides correct version in java.version property, but not in java.runtime.version property
return StringUtil.compareVersionNumbers(SystemInfo.JAVA_VERSION, "1.7") >= 0;
}
public static <T, V> ConcurrentMap<T,V> createMap() {
return DEFAULT_FACTORY._createMap();