Repository: flex-utilities Updated Branches: refs/heads/develop 80051f081 -> 3a8686ff1
- Changed code to be safe against NullPointerExceptions Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/3a8686ff Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/3a8686ff Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/3a8686ff Branch: refs/heads/develop Commit: 3a8686ff175e3269f6a30c73d3dcfdc7b1b172a4 Parents: 80051f0 Author: Christofer Dutz <[email protected]> Authored: Sat Jul 23 17:24:26 2016 +0200 Committer: Christofer Dutz <[email protected]> Committed: Sat Jul 23 17:24:26 2016 +0200 ---------------------------------------------------------------------- .../flex/utilities/converter/air/AirConverter.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/3a8686ff/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java ---------------------------------------------------------------------- diff --git a/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java b/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java index d4f9350..c4c2c08 100644 --- a/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java +++ b/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java @@ -83,7 +83,10 @@ public class AirConverter extends BaseConverter implements Converter { throw new ConverterException("Compiler directory does not exist."); } final List<File> files = new ArrayList<File>(); - files.addAll(Arrays.asList(directory.listFiles(new AirCompilerFilter()))); + File[] compilerFiles = directory.listFiles(new AirCompilerFilter()); + if(compilerFiles != null) { + files.addAll(Arrays.asList(compilerFiles)); + } // Add the smali.jar and baksmali.jar from the android/lib directory // as this is needed for Android packaging. @@ -91,7 +94,10 @@ public class AirConverter extends BaseConverter implements Converter { if (androidDir.exists() && androidDir.isDirectory()) { File androidLibDir = new File(androidDir, "lib"); if (androidLibDir.exists() && androidLibDir.isDirectory()) { - files.addAll(Arrays.asList(androidLibDir.listFiles(new AirCompilerFilter()))); + File[] compilerLibs = androidLibDir.listFiles(new AirCompilerFilter()); + if(compilerLibs != null) { + files.addAll(Arrays.asList(compilerLibs)); + } } } @@ -328,7 +334,10 @@ public class AirConverter extends BaseConverter implements Converter { throw new ConverterException("Framework directory does not exist."); } final List<File> files = new ArrayList<File>(); - files.addAll(Arrays.asList(directory.listFiles(new AirFrameworkFilter()))); + File[] frameworkFiles = directory.listFiles(new AirFrameworkFilter()); + if(frameworkFiles != null) { + files.addAll(Arrays.asList(frameworkFiles)); + } // Generate artifacts for every jar in the input directories. for (final File sourceFile : files) {
