[hibernate-commits] Hibernate SVN: r14277 - entitymanager/trunk/src/java/org/hibernate/ejb/packaging.

[hibernate-commits at lists.jboss.org]

Author: epbernard
Date: 2008-01-15 18:08:42 -0500 (Tue, 15 Jan 2008)
New Revision: 14277

Modified:
   entitymanager/trunk/src/java/org/hibernate/ejb/packaging/AbstractJarVisitor.java
Log:
EJB-299 package info in default package failed

Modified: entitymanager/trunk/src/java/org/hibernate/ejb/packaging/AbstractJarVisitor.java
===================================================================
--- entitymanager/trunk/src/java/org/hibernate/ejb/packaging/AbstractJarVisitor.java	2008-01-15 22:43:55 UTC (rev 14276)
+++ entitymanager/trunk/src/java/org/hibernate/ejb/packaging/AbstractJarVisitor.java	2008-01-15 23:08:42 UTC (rev 14277)
@@ -146,13 +146,19 @@
 
 	//TODO avoid 2 input stream when not needed
 	protected final void addElement(String entryName, InputStream is, InputStream secondIs) throws IOException {
+		int entryNameLength = entryName.length();
 		if ( entryName.endsWith( "package-info.class" ) ) {
-			String name = entryName.substring( 0, entryName.length() - ".package-info.class".length() )
-					.replace( '/', '.' );
+			String name;
+			if ( entryNameLength == "package-info.class".length() ) {
+				name = "";
+			}
+			else {
+				name = entryName.substring( 0, entryNameLength - ".package-info.class".length() ).replace( '/', '.' );
+			}
 			executeJavaElementFilter( name, packageFilters, is, secondIs );
 		}
 		else if ( entryName.endsWith( ".class" ) ) {
-			String name = entryName.substring( 0, entryName.length() - ".class".length() ).replace( '/', '.' );
+			String name = entryName.substring( 0, entryNameLength - ".class".length() ).replace( '/', '.' );
 			log.debug( "Filtering: " + name );
 			executeJavaElementFilter( name, classFilters, is, secondIs );
 		}