Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wolf2020-05-29 21:10:21 +0000
committerThomas Wolf2020-05-29 21:26:53 +0000
commitd5fbbe8ce118cc013c46772fff08a7ccdcb7b770 (patch)
tree266ea8ea01ab89b73a282383d1adfbe4181d3cac /org.eclipse.egit.core
parent867e4b0ff3c4fc8c345297c072ca23516da73800 (diff)
downloadegit-master.tar.gz
egit-master.tar.xz
egit-master.zip
Don't install the WindowCache JMX beanHEADmaster
The JMX registration accesses the git user config during plug-in activation and can be rather costly. Since this JMX bean is not really needed in Eclipse configure the WindowCache to not use it. Also catch ExceptionInInitializerError, which got thrown in the reported case where this JMX registration went wrong.[1] [1] https://www.eclipse.org/forums/index.php/t/1103963/ Bug: 563740 JGit-Dependency: I07ef7ae2f0208d177d2a03862846a8efe0191956 Change-Id: Ia5efb33ca40d1c32c6a587cad4f36ec70f4928c3 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Diffstat (limited to 'org.eclipse.egit.core')
-rw-r--r--org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java2
-rw-r--r--org.eclipse.egit.core/src/org/eclipse/egit/core/project/GitProjectData.java1
2 files changed, 2 insertions, 1 deletions
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java
index c9b519618..3c8f7e4e7 100644
--- a/org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java
@@ -258,7 +258,7 @@ public class Activator extends Plugin implements DebugOptionsListener {
indexDiffCache = new IndexDiffCache();
try {
GitProjectData.reconfigureWindowCache();
- } catch (RuntimeException e) {
+ } catch (RuntimeException | ExceptionInInitializerError e) {
logError(CoreText.Activator_ReconfigureWindowCacheError, e);
}
GitProjectData.attachToWorkspace();
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/project/GitProjectData.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/project/GitProjectData.java
index 671a24cc2..430c9c9cc 100644
--- a/org.eclipse.egit.core/src/org/eclipse/egit/core/project/GitProjectData.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/project/GitProjectData.java
@@ -425,6 +425,7 @@ public class GitProjectData {
}
c.setDeltaBaseCacheLimit(p.getInt(GitCorePreferences.core_deltaBaseCacheLimit, d.getInt(GitCorePreferences.core_deltaBaseCacheLimit, 0)));
c.setStreamFileThreshold(p.getInt(GitCorePreferences.core_streamFileThreshold, d.getInt(GitCorePreferences.core_streamFileThreshold, 0)));
+ c.setExposeStatsViaJmx(false);
c.install();
}

Back to the top