ALT Linux repos
Group :: Development/Java
RPM: eclipse-cdt
Main Changelog Spec Patches Sources Download Gear Bugs and FR Repocop
Patch: eclipse-cdt-bug472731.patch
Download
Download
diff -up ./org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java.fix ./org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java
--- ./org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java.fix 2008-11-28 15:52:21.000000000 -0500
+++ ./org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java 2008-11-28 15:52:50.000000000 -0500
@@ -21,6 +21,7 @@ import org.eclipse.cdt.core.resources.IC
import org.eclipse.cdt.managedbuilder.core.IBuilder;
import org.eclipse.cdt.managedbuilder.core.IConfiguration;
import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.core.IManagedProject;
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
import org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin;
import org.eclipse.cdt.managedbuilder.core.ManagedCProjectNature;
@@ -77,7 +78,8 @@ public class AutotoolsMakefileBuilder ex
// then return true.
if (project.getNature(ManagedCProjectNature.MNG_NATURE_ID) != null) {
IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project);
- if (info.getManagedProject().getProjectType().getId().equals(AUTOTOOLS_PROJECT_TYPE_ID)) {
+ IManagedProject m = info.getManagedProject();
+ if (m != null && m.getProjectType().getId().equals(AUTOTOOLS_PROJECT_TYPE_ID)) {
AutotoolsProjectNature.addAutotoolsBuilder(project, new NullProgressMonitor());
AutotoolsPlugin.verifyScannerInfoProvider(project);
return true;
@@ -85,7 +87,9 @@ public class AutotoolsMakefileBuilder ex
}
} catch (CoreException e) {
// Don't care...fall through to not found.
- }
+ } catch (Exception f) {
+ // Don't care...fall through to not found.
+ }
// Otherwise not found.
return false;
}