Bug 540779 - [code mining] Log error only if needed

Change-Id: I2ba19d304f729bf06bb8adf783b7bf47a2c6bade
Signed-off-by: angelozerr <angelo.zerr@gmail.com>

1 files changed, 15 insertions, 2 deletions

diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/codemining/CodeMiningManager.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/codemining/CodeMiningManager.java
index 91b689b3a7b..0e9cc07fba1 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/codemining/CodeMiningManager.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/codemining/CodeMiningManager.java
@@ -20,10 +20,13 @@ import java.util.LinkedHashMap;
 import java.util.List;

 import java.util.Map;

 import java.util.Set;

+import java.util.concurrent.CancellationException;

 import java.util.concurrent.CompletableFuture;

 import java.util.function.Function;

 import java.util.stream.Collectors;

 

+import org.osgi.framework.Bundle;

+

 import org.eclipse.swt.graphics.Rectangle;

 

 import org.eclipse.core.runtime.Assert;

@@ -151,9 +154,19 @@ public class CodeMiningManager implements Runnable {
 	}

 

 	private static void logCodeMiningProviderException(Throwable e) {

+		if (e != null && (e instanceof CancellationException || (e.getCause() != null && e.getCause() instanceof CancellationException))) {

+			return;

+		}

 		String PLUGIN_ID= "org.eclipse.jface.text"; //$NON-NLS-1$

-		ILog log= Platform.getLog(Platform.getBundle(PLUGIN_ID));

-		log.log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.OK, e.getMessage(), e));

+		Bundle plugin= Platform.getBundle(PLUGIN_ID);

+		if (plugin != null) {

+			// In OSGi context, uses Platform Text log

+			ILog log= Platform.getLog(plugin);

+			log.log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.OK, e.getMessage(), e));

+		} else {

+			// In java main context, print stack trace

+			System.err.println("Error while code mining process: " + e.getMessage()); //$NON-NLS-1$

+		}

 	}

 

 	/**