DefaultPersistenceUnitManager extracts jar file from default persistence unit root URL

jhoeller · jhoeller · commit bb7d20762c0c · 2016-09-26T15:15:45.000+02:00
Issue: SPR-14749
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
@@ -615,8 +615,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
`@@ -615,8 +615,8 @@ private URL determineDefaultPersistenceUnitRootUrl() {`
`615`	`615`	`return null;`
`616`	`616`	`}`
`617`	`617`	`try {`
`618`		`- Resource res = this.resourcePatternResolver.getResource(this.defaultPersistenceUnitRootLocation);`
`619`		`- return res.getURL();`
	`618`	`+ URL url = this.resourcePatternResolver.getResource(this.defaultPersistenceUnitRootLocation).getURL();`
	`619`	`+ return (ResourceUtils.isJarURL(url) ? ResourceUtils.extractJarFileURL(url) : url);`
`620`	`620`	`}`
`621`	`621`	`catch (IOException ex) {`
`622`	`622`	`throw new PersistenceException("Unable to resolve persistence unit root URL", ex);`