Skip to content

Commit 71c7e6b

Browse files
basilevsHannesWell
authored andcommitted
Do not log an error when a background job is interrupted by shutdown
Fixes #2025
1 parent bc9f536 commit 71c7e6b

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

org.eclipse.m2e.core/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %Bundle-Name
44
Bundle-SymbolicName: org.eclipse.m2e.core;singleton:=true
5-
Bundle-Version: 2.7.4.qualifier
5+
Bundle-Version: 2.7.500.qualifier
66
Bundle-Activator: org.eclipse.m2e.core.internal.MavenPluginActivator
77
Bundle-Vendor: %Bundle-Vendor
88
Bundle-Localization: plugin

org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/repository/RepositoryRegistryUpdateJob.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.eclipse.core.runtime.Status;
2222

2323
import org.eclipse.m2e.core.internal.Messages;
24+
import org.eclipse.m2e.core.internal.MavenPluginActivator;
2425
import org.eclipse.m2e.core.internal.jobs.IBackgroundProcessingQueue;
2526
import org.eclipse.m2e.core.internal.jobs.MavenJob;
2627

@@ -50,6 +51,11 @@ public IStatus run(IProgressMonitor monitor) {
5051
registry.updateRegistry(monitor);
5152
} catch(CoreException ex) {
5253
return ex.getStatus();
54+
} catch (IllegalStateException ex) {
55+
// Ignore failures on shutdown https://github.com/eclipse-m2e/m2e-core/issues/2025
56+
if (MavenPluginActivator.getDefault() != null) {
57+
throw ex;
58+
}
5359
}
5460
return Status.OK_STATUS;
5561
}

org.eclipse.m2e.feature/feature.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<feature
33
id="org.eclipse.m2e.feature"
44
label="%featureName"
5-
version="2.9.1.qualifier"
5+
version="2.9.200.qualifier"
66
provider-name="%providerName"
77
plugin="org.eclipse.m2e.core"
88
license-feature="org.eclipse.license"

0 commit comments

Comments
 (0)