Merge branch 'master' into issue-1639

This commit is contained in:
Connor Tumbleson 2017-10-24 15:39:28 -04:00 committed by GitHub
commit c23c1303dd

View File

@ -791,13 +791,11 @@ final public class AndrolibResources {
File dir = new File(path); File dir = new File(path);
if (!dir.isDirectory() && dir.isFile()) { if (!dir.isDirectory() && dir.isFile()) {
LOGGER.severe("--frame-path is set to a file, not a directory."); throw new AndrolibException("--frame-path is set to a file, not a directory.");
System.exit(1);
} }
if (dir.getParentFile() != null && dir.getParentFile().isFile()) { if (dir.getParentFile() != null && dir.getParentFile().isFile()) {
LOGGER.severe("Please remove file at " + dir.getParentFile()); throw new AndrolibException("Please remove file at " + dir.getParentFile());
System.exit(1);
} }
if (! dir.exists()) { if (! dir.exists()) {