Browse Source

REPORT-18917 嵌入式部署10.0报错404+部署后模板访问空白

解决 serviceloader 加载冲突的问题。
解决 third - hibernate 读取嵌入式 hibernate 的问题。
bugfix/10.0
Harrison 5 years ago
parent
commit
1b4a355019
  1. 0
      fine-ehcache/resources/META-INF/services/com.fr.third.org.hibernate.boot.registry.selector.StrategyRegistrationProvider
  2. 2
      fine-hibernate/src/com/fr/third/org/hibernate/cfg/Environment.java

0
fine-ehcache/resources/META-INF/services/org.hibernate.boot.registry.selector.StrategyRegistrationProvider → fine-ehcache/resources/META-INF/services/com.fr.third.org.hibernate.boot.registry.selector.StrategyRegistrationProvider vendored

2
fine-hibernate/src/com/fr/third/org/hibernate/cfg/Environment.java

@ -192,7 +192,7 @@ public final class Environment implements AvailableSettings {
GLOBAL_PROPERTIES.setProperty( USE_REFLECTION_OPTIMIZER, Boolean.FALSE.toString() );
try {
InputStream stream = ConfigHelper.getResourceAsStream( "/hibernate.properties" );
InputStream stream = ConfigHelper.getResourceAsStream( "/fr-hibernate.properties" );
try {
GLOBAL_PROPERTIES.load(stream);
LOG.propertiesLoaded( ConfigurationHelper.maskOut( GLOBAL_PROPERTIES, PASS ) );

Loading…
Cancel
Save