Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added protected "isPersistenceUnitOverrideAllowed()" method to DefaultPersistenceUnitManager (SPR-8925)

Browse Source
This commit is contained in:
Juergen Hoeller
2011-12-22 03:22:35 +01:00
committed by Chris Beams
parent e0252ad0b1
commit 103c648a92
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
org.springframework.orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java
View File

@@ -353,7 +353,7 @@ public class DefaultPersistenceUnitManager
}
postProcessPersistenceUnitInfo(pui);
String name = pui.getPersistenceUnitName();
if (!this.persistenceUnitInfoNames.add(name)) {
if (!this.persistenceUnitInfoNames.add(name) && !isPersistenceUnitOverrideAllowed()) {
StringBuilder msg = new StringBuilder();
msg.append("Conflicting persistence unit definitions for name '").append(name).append("': ");
msg.append(pui.getPersistenceUnitRootUrl()).append(", ");
@@ -478,7 +478,7 @@ public class DefaultPersistenceUnitManager
/**
* Hook method allowing subclasses to customize each PersistenceUnitInfo.
* <p>Default implementation delegates to all registered PersistenceUnitPostProcessors.
* <p>The default implementation delegates to all registered PersistenceUnitPostProcessors.
* It is usually preferable to register further entity classes, jar files etc there
* rather than in a subclass of this manager, to be able to reuse the post-processors.
* @param pui the chosen PersistenceUnitInfo, as read from <code>persistence.xml</code>.
@@ -494,6 +494,15 @@ public class DefaultPersistenceUnitManager
}
}
/**
* Return whether an override of a same-named persistence unit is allowed.
* <p>Default is <code>false</code>. May be overridden to return <code>true</code>,
* for example if {@link #postProcessPersistenceUnitInfo} is able to handle that case.
*/
protected boolean isPersistenceUnitOverrideAllowed() {
return false;
}
public PersistenceUnitInfo obtainDefaultPersistenceUnitInfo() {
if (this.persistenceUnitInfoNames.isEmpty()) {