summaryrefslogtreecommitdiff
path: root/java/eclipse/files/patch-eclipse.platform.runtime
diff options
context:
space:
mode:
authorJonathan Chen <jonc@chen.org.nz>2022-06-03 12:06:36 +0200
committerKurt Jaeger <pi@FreeBSD.org>2022-06-03 12:06:36 +0200
commita0c13b4a90b805807864f484d8ade07906198dbf (patch)
treec832a120839ddc61118b6c1750ee556f054ba270 /java/eclipse/files/patch-eclipse.platform.runtime
parentsysutils/pftop: Take maintainership (diff)
java/eclipse: update 4.16 -> 4.21
This release is 1.5 years overdue and 6 months out-of-date, but is an important interim step to the 4.24 release due in June 2022. Massive thanks go to Patrick Mackinlay who resolved the 2 critical bugs preventing update from coming out sooner! Author: Jonathan Chen <jonc@chen.org.nz> PR: 264400
Diffstat (limited to 'java/eclipse/files/patch-eclipse.platform.runtime')
-rw-r--r--java/eclipse/files/patch-eclipse.platform.runtime6
1 files changed, 3 insertions, 3 deletions
diff --git a/java/eclipse/files/patch-eclipse.platform.runtime b/java/eclipse/files/patch-eclipse.platform.runtime
index ef7a0a27c589..82356ea0459f 100644
--- a/java/eclipse/files/patch-eclipse.platform.runtime
+++ b/java/eclipse/files/patch-eclipse.platform.runtime
@@ -2,8 +2,8 @@ diff -ru eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclip
--- eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java 0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java 0000-00-00 00:00:00.000000000 +0000
@@ -63,7 +63,7 @@
- //XXX This is not synchronized
- private Map<Bundle,Log> logs = new HashMap<>(5);
+
+ private Map<Bundle, Log> logs = new ConcurrentHashMap<>(5);
- private static final String[] OS_LIST = { Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_WIN32 };
+ private static final String[] OS_LIST = { Platform.OS_FREEBSD, Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_WIN32 };
@@ -13,7 +13,7 @@ diff -ru eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclip
diff -ru eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java
--- eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java 0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java 0000-00-00 00:00:00.000000000 +0000
-@@ -208,6 +208,8 @@
+@@ -206,6 +206,8 @@
*/
public static final String OS_LINUX = "linux";//$NON-NLS-1$