From cccc2201e082ae0c0e15adb8685dbd7122daf3e0 Mon Sep 17 00:00:00 2001 From: maoo Date: Sat, 14 Apr 2012 21:18:02 +0000 Subject: [PATCH] prevent NPE, which occured when the AMP finalName was not complying with ${artifactId}-${version} structure git-svn-id: http://maven-alfresco-archetypes.googlecode.com/svn/trunk@426 04253f4f-3451-0410-a141-5562f1e59037 --- .../java/org/alfresco/plexus/archiver/AmpUnArchiver.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/plugins/maven-amp-plugin/src/main/java/org/alfresco/plexus/archiver/AmpUnArchiver.java b/plugins/maven-amp-plugin/src/main/java/org/alfresco/plexus/archiver/AmpUnArchiver.java index 9da815db..f01b1e33 100644 --- a/plugins/maven-amp-plugin/src/main/java/org/alfresco/plexus/archiver/AmpUnArchiver.java +++ b/plugins/maven-amp-plugin/src/main/java/org/alfresco/plexus/archiver/AmpUnArchiver.java @@ -161,8 +161,11 @@ public class AmpUnArchiver extends AbstractZipUnArchiver { String ampName = zipFile.getName(); ampName = FileUtils.removeExtension(FileUtils.removePath(ampName)); - ampName = ampName.substring(0, ampName.lastIndexOf('-')); - + int ampNameIndex = ampName.lastIndexOf('-'); + if (ampNameIndex > 0) { + ampName = ampName.substring(0, ampNameIndex); + } + ampMapping.put("module.properties", "WEB-INF"+ fileSeparator +"classes" + fileSeparator +"alfresco" + fileSeparator +"module" + fileSeparator + moduleId + fileSeparator); ampMapping.put("config", "WEB-INF"+fileSeparator+"classes"+ fileSeparator); ampMapping.put("lib", "WEB-INF" + fileSeparator + "lib" +fileSeparator);