Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Gvozdev2013-08-26 11:02:02 -0400
committerAndrew Gvozdev2013-08-27 11:23:52 -0400
commit614878662c5f0556a79cc55b20da2a19ef03e744 (patch)
treec6670bda4e8a3d486f78ebf2425286d105174318
parent8a58b3aa2334302078fbb6888d66caaf39dcbe92 (diff)
downloadorg.eclipse.cdt-614878662c5f0556a79cc55b20da2a19ef03e744.tar.gz
org.eclipse.cdt-614878662c5f0556a79cc55b20da2a19ef03e744.tar.xz
org.eclipse.cdt-614878662c5f0556a79cc55b20da2a19ef03e744.zip
bug 415841: more info to the log in case of exception
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChain.java16
1 files changed, 13 insertions, 3 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChain.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChain.java
index 547db78039..924d2d7616 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChain.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChain.java
@@ -47,6 +47,7 @@ import org.eclipse.cdt.managedbuilder.core.ITargetPlatform;
import org.eclipse.cdt.managedbuilder.core.ITool;
import org.eclipse.cdt.managedbuilder.core.IToolChain;
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin;
import org.eclipse.cdt.managedbuilder.envvar.IConfigurationEnvironmentVariableSupplier;
import org.eclipse.cdt.managedbuilder.internal.dataprovider.ConfigurationDataProvider;
import org.eclipse.cdt.managedbuilder.internal.enablement.OptionEnablementExpression;
@@ -58,7 +59,9 @@ import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtension;
import org.eclipse.core.runtime.IExtensionPoint;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Status;
import org.osgi.framework.Version;
public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProvider<ToolChain>, IRealBuildObjectAssociation {
@@ -1723,7 +1726,7 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
@Override
public boolean isSupported(){
- if (managedIsToolChainSupported == null) {
+ if (managedIsToolChainSupported == null) {
IConfigurationElement element = getIsToolChainSupportedElement();
if (element != null) {
try {
@@ -1734,8 +1737,15 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
}
}
- if(managedIsToolChainSupported != null)
- return managedIsToolChainSupported.isSupported(this,null,null);
+ if (managedIsToolChainSupported != null) {
+ try {
+ return managedIsToolChainSupported.isSupported(this,null,null);
+ } catch (Throwable e) {
+ ManagedBuilderCorePlugin.log(new Status(IStatus.ERROR, ManagedBuilderCorePlugin.PLUGIN_ID,
+ "Exception in toolchain [" + getName() + "], id=" + getId(), e)); //$NON-NLS-1$ //$NON-NLS-2$
+ return false;
+ }
+ }
return true;
}

Back to the top