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

Fix to avoid NPEs in data serialization for the case some settings are not initialized

Browse source
This commit is contained in:
Mikhail Sennikovsky 2007-03-27 13:27:09 +00:00
parent 144c64ed44
commit 038a5598b4
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/ScannerConfigInfoFactory2.java
View file

@ -1033,7 +1033,8 @@ public class ScannerConfigInfoFactory2 {
child = doc.createElement(BUILD_OUTPUT_PROVIDER); child = doc.createElement(BUILD_OUTPUT_PROVIDER);
grandchild = doc.createElement(OPEN_ACTION); grandchild = doc.createElement(OPEN_ACTION);
grandchild.setAttribute(ENABLED, Boolean.toString(po.buildOutputFileActionEnabled)); grandchild.setAttribute(ENABLED, Boolean.toString(po.buildOutputFileActionEnabled));
grandchild.setAttribute(FILE_PATH, po.buildOutputFilePath); if(po.buildOutputFilePath != null)
grandchild.setAttribute(FILE_PATH, po.buildOutputFilePath);
child.appendChild(grandchild); child.appendChild(grandchild);
grandchild = doc.createElement(PARSER); grandchild = doc.createElement(PARSER);
grandchild.setAttribute(ENABLED, Boolean.toString(po.buildOutputParserEnabled)); grandchild.setAttribute(ENABLED, Boolean.toString(po.buildOutputParserEnabled));
@ -1061,12 +1062,15 @@ public class ScannerConfigInfoFactory2 {
if (providerKind.equals(ScannerConfigProfile.ScannerInfoProvider.RUN)) { if (providerKind.equals(ScannerConfigProfile.ScannerInfoProvider.RUN)) {
grandchild = doc.createElement(RUN_ACTION); grandchild = doc.createElement(RUN_ACTION);
grandchild.setAttribute(USE_DEFAULT, Boolean.toString(ppo.providerRunUseDefault)); grandchild.setAttribute(USE_DEFAULT, Boolean.toString(ppo.providerRunUseDefault));
grandchild.setAttribute(COMMAND, ppo.providerRunCommand); if(ppo.providerRunCommand != null)
grandchild.setAttribute(ARGUMENTS, ppo.providerRunArguments); grandchild.setAttribute(COMMAND, ppo.providerRunCommand);
if(ppo.providerRunArguments != null)
grandchild.setAttribute(ARGUMENTS, ppo.providerRunArguments);
} }
else if (providerKind.equals(ScannerConfigProfile.ScannerInfoProvider.OPEN)) { else if (providerKind.equals(ScannerConfigProfile.ScannerInfoProvider.OPEN)) {
grandchild = doc.createElement(OPEN_ACTION); grandchild = doc.createElement(OPEN_ACTION);
grandchild.setAttribute(FILE_PATH, ppo.providerOpenFilePath); if(ppo.providerOpenFilePath != null)
grandchild.setAttribute(FILE_PATH, ppo.providerOpenFilePath);
} }
child.appendChild(grandchild); child.appendChild(grandchild);
// parser // parser