From 824ceff66390983a060ec4b70f6f3d03525ba2ad Mon Sep 17 00:00:00 2001 From: "vB Results, LLC" Date: Wed, 19 Jul 2017 20:17:31 +0900 Subject: [PATCH] Strict file type check for readClasses, fixes #799 Ping @NathanaelA @Pip3r4o https://github.com/NativeScript/android-runtime/issues/799#issuecomment-316277937 --- .../staticbindinggenerator/Generator.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/android-static-binding-generator/project/staticbindinggenerator/src/main/java/org/nativescript/staticbindinggenerator/Generator.java b/android-static-binding-generator/project/staticbindinggenerator/src/main/java/org/nativescript/staticbindinggenerator/Generator.java index 55c73109b..458e4ae9d 100644 --- a/android-static-binding-generator/project/staticbindinggenerator/src/main/java/org/nativescript/staticbindinggenerator/Generator.java +++ b/android-static-binding-generator/project/staticbindinggenerator/src/main/java/org/nativescript/staticbindinggenerator/Generator.java @@ -241,8 +241,19 @@ private Map readClasses(String[] libs, boolean throwOnError) if (libs != null) { for (String lib : libs) { File f = new File(lib); - Map classes = f.isFile() ? readJar(lib, throwOnError) : readDir(lib, throwOnError); - map.putAll(classes); + Map classes = null; + + if (f.isFile()) { + classes = readJar(lib, throwOnError); + } + + if (f.isDirectory()) { + classes = readDir(lib, throwOnError); + } + + if (classes != null) { + map.putAll(classes); + } } } return map;