mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Bug 394735: NPE when parallelizationNumber is missing, modified patch from Mohamed Hussein <mohamed_hussein@mentor.com>

Browse source
This commit is contained in:
Andrew Gvozdev 2012-11-21 10:32:52 -05:00
parent 6012e77cfa
commit 3c6d895d64
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Builder.java
View file

@ -632,26 +632,27 @@ public class Builder extends HoldsOptions implements IBuilder, IMatchKeyProvider
private int decodeParallelizationNumber(String value) { private int decodeParallelizationNumber(String value) {
int parallelNumber = -1; int parallelNumber = -1;
if (VALUE_OPTIMAL.equals(value)) { if (value == null || VALUE_OPTIMAL.equals(value)) {
parallelNumber = -getOptimalParallelJobNum(); parallelNumber = -getOptimalParallelJobNum();
} else if (VALUE_UNLIMITED.equals(value)) { } else if (VALUE_UNLIMITED.equals(value)) {
parallelNumber = UNLIMITED_JOBS; parallelNumber = UNLIMITED_JOBS;
} else { } else {
try { try {
parallelNumber = Integer.decode(value); parallelNumber = Integer.decode(value);
if (parallelNumber <= 0) {
// compatibility with legacy representation - it was that inconsistent
if (isInternalBuilder()) {
// "optimal" for Internal Builder
parallelNumber = -getOptimalParallelJobNum();
} else {
// unlimited for External Builder
parallelNumber = UNLIMITED_JOBS;
}
}
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
ManagedBuilderCorePlugin.log(e); ManagedBuilderCorePlugin.log(e);
parallelNumber = getOptimalParallelJobNum(); // default to "optimal" if not recognized
} parallelNumber = -getOptimalParallelJobNum();
if (parallelNumber <= 0) {
// compatibility with legacy representation - it was that inconsistent
if (isInternalBuilder()) {
// "optimal" for Internal Builder
parallelNumber = -getOptimalParallelJobNum();
} else {
// unlimited for External Builder
parallelNumber = UNLIMITED_JOBS;
}
} }
} }
return parallelNumber; return parallelNumber;