Author: rmannibucau
Date: Sun Jun 1 12:42:58 2014
New Revision: 1598982
URL: http://svn.apache.org/r1598982
Log:
using UNSPECIFIED as default eagerly for shared cache mode and not lazily since
we completely handle the lifecycle in this case
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ReloadableEntityManagerFactory.java
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ReloadableEntityManagerFactory.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ReloadableEntityManagerFactory.java?rev=1598982&r1=1598981&r2=1598982&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ReloadableEntityManagerFactory.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ReloadableEntityManagerFactory.java
Sun Jun 1 12:42:58 2014
@@ -279,10 +279,12 @@ public class ReloadableEntityManagerFact
public synchronized void setSharedCacheMode(final SharedCacheMode mode) {
final PersistenceUnitInfoImpl info =
entityManagerFactoryCallable.getUnitInfo();
- info.setSharedCacheMode(null != mode ? mode :
SharedCacheMode.UNSPECIFIED);
+ info.setSharedCacheMode(mode);
final Properties properties =
entityManagerFactoryCallable.getUnitInfo().getProperties();
- properties.setProperty(JAVAX_PERSISTENCE_SHARED_CACHE_MODE, null !=
mode ? mode.name() : "UNSPECIFIED");
+ if (properties.containsKey(JAVAX_PERSISTENCE_SHARED_CACHE_MODE)) {
+ properties.setProperty(JAVAX_PERSISTENCE_SHARED_CACHE_MODE,
mode.name());
+ }
}
public synchronized void setValidationMode(final ValidationMode mode) {
@@ -504,7 +506,8 @@ public class ReloadableEntityManagerFact
@Description("change the shared cache mode if possible (value is ok)")
public void setSharedCacheMode(final String value) {
try {
- final SharedCacheMode mode =
SharedCacheMode.valueOf(value.trim().toUpperCase());
+ final String v = value.trim().toUpperCase();
+ final SharedCacheMode mode = v.isEmpty() ?
SharedCacheMode.UNSPECIFIED : SharedCacheMode.valueOf(v);
reloadableEntityManagerFactory.setSharedCacheMode(mode);
} catch (final Exception iae) {
// ignored
