diff options
author | Andrew Gvozdev | 2013-08-26 15:02:02 +0000 |
---|---|---|
committer | Andrew Gvozdev | 2013-08-27 15:28:45 +0000 |
commit | 2c5fcc3d856c571613317d68dcc66ddba5f9d114 (patch) | |
tree | bc04a5e6f07d4fcf9159fc994980dcc7091242e9 | |
parent | 9745cb982655172e4a354dd967e80dee06ad3bc5 (diff) | |
download | org.eclipse.cdt-2c5fcc3d856c571613317d68dcc66ddba5f9d114.tar.gz org.eclipse.cdt-2c5fcc3d856c571613317d68dcc66ddba5f9d114.tar.xz org.eclipse.cdt-2c5fcc3d856c571613317d68dcc66ddba5f9d114.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.java | 16 |
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 547db780397..924d2d76160 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; } |