DefaultPersistenceUnitManager extracts jar file from default persistence unit root URL

jhoeller · jhoeller · commit acdf139137ac · 2016-09-26T16:21:33.000+02:00
Issue: SPR-14749 (cherry picked from commit bb7d207)
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java
@@ -598,8 +598,8 @@ private URL determineDefaultPersistenceUnitRootUrl() {
 			return null;
 		}
 		try {
-			Resource res = this.resourcePatternResolver.getResource(this.defaultPersistenceUnitRootLocation);
-			return res.getURL();
+			URL url = this.resourcePatternResolver.getResource(this.defaultPersistenceUnitRootLocation).getURL();
+			return (ResourceUtils.isJarURL(url) ? ResourceUtils.extractJarFileURL(url) : url);
 		}
 		catch (IOException ex) {
 			throw new PersistenceException("Unable to resolve persistence unit root URL", ex);

Original file line number	Diff line number	Diff line change
`@@ -598,8 +598,8 @@ private URL determineDefaultPersistenceUnitRootUrl() {`
`598`	`598`	`return null;`
`599`	`599`	`}`
`600`	`600`	`try {`
`601`		`- Resource res = this.resourcePatternResolver.getResource(this.defaultPersistenceUnitRootLocation);`
`602`		`- return res.getURL();`
	`601`	`+ URL url = this.resourcePatternResolver.getResource(this.defaultPersistenceUnitRootLocation).getURL();`
	`602`	`+ return (ResourceUtils.isJarURL(url) ? ResourceUtils.extractJarFileURL(url) : url);`
`603`	`603`	`}`
`604`	`604`	`catch (IOException ex) {`
`605`	`605`	`throw new PersistenceException("Unable to resolve persistence unit root URL", ex);`