HHH-8821 corrected failing test

brmeyer · brmeyer · commit 4fc9c70b0c0b · 2014-01-09T14:41:07.000-05:00
diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/archive/spi/AbstractArchiveDescriptor.java b/hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/archive/spi/AbstractArchiveDescriptor.java
@@ -74,7 +74,7 @@ protected String getEntryBasePrefix() {
 
 	protected String extractRelativeName(ZipEntry zipEntry) {
 		final String entryName = extractName( zipEntry );
-		return entryBasePrefix == null ? entryName : entryName.substring( entryBasePrefix.length() );
+		return entryBasePrefix != null && entryName.contains( entryBasePrefix ) ? entryName.substring( entryBasePrefix.length() ) : entryName;
 	}
 
 	protected String extractName(ZipEntry zipEntry) {

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ protected String getEntryBasePrefix() {`
`74`	`74`
`75`	`75`	`protected String extractRelativeName(ZipEntry zipEntry) {`
`76`	`76`	`final String entryName = extractName( zipEntry );`
`77`		`- return entryBasePrefix == null ? entryName : entryName.substring( entryBasePrefix.length() );`
	`77`	`+ return entryBasePrefix != null && entryName.contains( entryBasePrefix ) ? entryName.substring( entryBasePrefix.length() ) : entryName;`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`protected String extractName(ZipEntry zipEntry) {`