From a60b631445f99ea67c5738f007147d2d8f07d3ef Mon Sep 17 00:00:00 2001
From: Conor MacNeill <conor@apache.org>
Date: Wed, 20 Mar 2002 13:47:05 +0000
Subject: [PATCH] Better handling of malformed desscriptor names

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271923 13f79535-47bb-0310-9956-ffa450edef68
---
 .../ant/taskdefs/optional/ejb/GenericDeploymentTool.java      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
index 94127ec2f..4f6c57d36 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
@@ -574,8 +574,10 @@ public class GenericDeploymentTool implements EJBDeploymentTool {
 
             if (endBaseName != -1) {
                 baseName = descriptorFileName.substring(0, endBaseName);
+            } else {
+                throw new BuildException("Unable to determine jar name " 
+                    + "from descriptor \"" + descriptorFileName + "\"");
             }
-            baseName = descriptorFileName.substring(0, endBaseName);
         } else if (config.namingScheme.getValue().equals(EjbJar.NamingScheme.DIRECTORY)) {
             File descriptorFile = new File(config.descriptorDir, descriptorFileName);
             String path = descriptorFile.getAbsolutePath();