mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 17:56:01 +02:00
Code Issues Wiki Activity

1. Fix for [Bug 186665] CDT 4 update old version project failed.

Browse source 
2. fix NPE in MBSMacroSupplier
This commit is contained in:
Mikhail Sennikovsky 2007-05-14 18:14:15 +00:00
parent 3add45dbdf
commit 049b386dc5
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java
View file

@ -2910,6 +2910,7 @@ public class ManagedBuildManager extends AbstractCExtension implements IScannerI
} }
public static IManagedBuildInfo getBuildInfoLegacy(IProject project){ public static IManagedBuildInfo getBuildInfoLegacy(IProject project){
synchronized(project){
IManagedBuildInfo info = null; IManagedBuildInfo info = null;
try { try {
info = getLoaddedBuildInfo(project); info = getLoaddedBuildInfo(project);
@ -2927,6 +2928,7 @@ public class ManagedBuildManager extends AbstractCExtension implements IScannerI
} }
return info; return info;
}
} }
/** /**
* Finds, but does not create, the managed build information for the * Finds, but does not create, the managed build information for the

4
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/MbsMacroSupplier.java
View file

@ -425,7 +425,7 @@ public class MbsMacroSupplier extends BuildCdtVariablesSupplierBase {
ITool targetTool = cfg.calculateTargetTool(); ITool targetTool = cfg.calculateTargetTool();
if(targetTool != null){ if(targetTool != null){
IOutputType pot = targetTool.getPrimaryOutputType(); IOutputType pot = targetTool.getPrimaryOutputType();
String prefix = pot.getOutputPrefix(); String prefix = pot != null ? pot.getOutputPrefix() : ""; //$NON-NLS-1$
// Resolve any macros in the outputPrefix // Resolve any macros in the outputPrefix
@ -486,7 +486,7 @@ public class MbsMacroSupplier extends BuildCdtVariablesSupplierBase {
ITool targetTool = cfg.calculateTargetTool(); ITool targetTool = cfg.calculateTargetTool();
if(targetTool != null){ if(targetTool != null){
IOutputType pot = targetTool.getPrimaryOutputType(); IOutputType pot = targetTool.getPrimaryOutputType();
String prefix = pot.getOutputPrefix(); String prefix = pot != null ? pot.getOutputPrefix() : ""; //$NON-NLS-1$
// Resolve any macros in the outputPrefix // Resolve any macros in the outputPrefix
// Note that we cannot use file macros because if we do a clean // Note that we cannot use file macros because if we do a clean