From 3656e61075e70b16e6e96cfdb6673eb296595c2c Mon Sep 17 00:00:00 2001 From: Eugene Kudelevsky Date: Thu, 22 Sep 2011 20:34:50 +0400 Subject: [PATCH] EA-29787 fix IAE --- .../android/maven/AndroidMavenProviderImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/plugins/android/src/org/jetbrains/android/maven/AndroidMavenProviderImpl.java b/plugins/android/src/org/jetbrains/android/maven/AndroidMavenProviderImpl.java index 955fb9e2cccb..c06f68f88536 100644 --- a/plugins/android/src/org/jetbrains/android/maven/AndroidMavenProviderImpl.java +++ b/plugins/android/src/org/jetbrains/android/maven/AndroidMavenProviderImpl.java @@ -95,10 +95,13 @@ public class AndroidMavenProviderImpl implements AndroidMavenProvider { List includes = MavenResourceCompiler.collectPatterns(resource.getIncludes(), "**/*"); List excludes = MavenResourceCompiler.collectPatterns(resource.getExcludes(), null); - String targetPath = FileUtil.toSystemIndependentName(resource.getTargetPath()); + final String resourceTargetPath = resource.getTargetPath(); + if (resourceTargetPath != null) { + String targetPath = FileUtil.toSystemIndependentName(resourceTargetPath); - if (processResources(module.getProject(), resDir, resDir, includes, excludes, targetPath, processor)) { - return true; + if (processResources(module.getProject(), resDir, resDir, includes, excludes, targetPath, processor)) { + return true; + } } } }