diff options
| author | Johannes Schanda <schanda@itestra.de> | 2013-09-30 12:47:58 +0200 |
|---|---|---|
| committer | Johannes Schanda <schanda@itestra.de> | 2013-09-30 12:47:58 +0200 |
| commit | d36dc810226aea3931ab137c2b070b2dda4dad46 (patch) | |
| tree | 287f5a285b05494a40e020e9d6b95767ef7ca00e | |
| parent | c9f51da32874fdef627da7ff922eec18f47e4f55 (diff) | |
| download | genivi-common-api-runtime-d36dc810226aea3931ab137c2b070b2dda4dad46.tar.gz | |
Fix hidden null pointer exception
Consistently set all execution environments to 1.5
3 files changed, 11 insertions, 8 deletions
diff --git a/org.genivi.commonapi.core.ui/META-INF/MANIFEST.MF b/org.genivi.commonapi.core.ui/META-INF/MANIFEST.MF index af4c129..193a264 100644 --- a/org.genivi.commonapi.core.ui/META-INF/MANIFEST.MF +++ b/org.genivi.commonapi.core.ui/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.ui, com.google.inject;bundle-version="3.0.0", org.genivi.commonapi.core;bundle-version="2.1.1", org.eclipse.cdt.ui;bundle-version="5.5.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy Import-Package: javax.inject, org.franca.core.dsl.validation, diff --git a/org.genivi.commonapi.core.validator/META-INF/MANIFEST.MF b/org.genivi.commonapi.core.validator/META-INF/MANIFEST.MF index 5787513..4937d0f 100644 --- a/org.genivi.commonapi.core.validator/META-INF/MANIFEST.MF +++ b/org.genivi.commonapi.core.validator/META-INF/MANIFEST.MF @@ -1,9 +1,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Validator +Bundle-Name: GENIVI Common API validator +Bundle-Vendor: BMW AG Bundle-SymbolicName: org.genivi.commonapi.core.validator;singleton:=true Bundle-Version: 2.1.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.ui, org.eclipse.core.expressions;bundle-version="3.4.400", org.eclipse.core.resources, diff --git a/org.genivi.commonapi.core.validator/src/org/genivi/commonapi/core/validator/ResourceValidator.java b/org.genivi.commonapi.core.validator/src/org/genivi/commonapi/core/validator/ResourceValidator.java index 3594885..49ef9c7 100644 --- a/org.genivi.commonapi.core.validator/src/org/genivi/commonapi/core/validator/ResourceValidator.java +++ b/org.genivi.commonapi.core.validator/src/org/genivi/commonapi/core/validator/ResourceValidator.java @@ -499,11 +499,13 @@ public class ResourceValidator implements IFrancaExternalValidator { return; } } else { - cyclicList.add(filePath); - for (String importPath : importList.get(filePath)) { - findCyclicImports(importPath, filePath, cyclicList, imp, - messageAcceptor); - } + cyclicList.add(filePath); + if (importList.containsKey(filePath)) { + for (String importPath : importList.get(filePath)) { + findCyclicImports(importPath, filePath, cyclicList, imp, + messageAcceptor); + } + } cyclicList.remove(cyclicList.size() - 1); } } |