catch up with development
Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
diff --git a/org.eclipse.osbp.persistence/src/org/eclipse/osbp/persistence/EntityClassLoader.java b/org.eclipse.osbp.persistence/src/org/eclipse/osbp/persistence/EntityClassLoader.java
index 715d793..b1847c7 100644
--- a/org.eclipse.osbp.persistence/src/org/eclipse/osbp/persistence/EntityClassLoader.java
+++ b/org.eclipse.osbp.persistence/src/org/eclipse/osbp/persistence/EntityClassLoader.java
@@ -26,7 +26,7 @@
@Override
public Class<?> loadClass(String className) throws ClassNotFoundException {
if(!cachedClasses.containsKey(className)) {
- ClassLoader loader = dslMetadataService.getClassLoader(className);
+ ClassLoader loader = dslMetadataService.getEntityClassLoader(className);
if (loader != null) {
Class<?> clz = loader.loadClass(className);
cachedClasses.put(className, clz);
@@ -40,7 +40,7 @@
@Override
public InputStream getResourceAsStream(String resourceName) {
- ClassLoader loader = dslMetadataService.getClassLoader(resourceName);
+ ClassLoader loader = dslMetadataService.getEntityClassLoader(resourceName);
if (loader != null) {
return loader.getResourceAsStream(resourceName);
}
diff --git a/org.eclipse.osbp.persistence/src/org/eclipse/osbp/persistence/PersistenceService.java b/org.eclipse.osbp.persistence/src/org/eclipse/osbp/persistence/PersistenceService.java
index 48a91c6..22b4ee7 100644
--- a/org.eclipse.osbp.persistence/src/org/eclipse/osbp/persistence/PersistenceService.java
+++ b/org.eclipse.osbp.persistence/src/org/eclipse/osbp/persistence/PersistenceService.java
@@ -657,6 +657,10 @@
*/
@Override
public void clearCubeCache(RolapConnection connection, String cubeName) {
+ if( connection == null ) {
+ log.error("ignore 'clearCubeCache' due to connection == null!");
+ return;
+ }
Cube cube = connection.getSchema().lookupCube(cubeName, true);
if(cube != null) {
CacheControl cacheControl = connection.getCacheControl(null);
@@ -671,6 +675,10 @@
*/
@Override
public void clearJpaCache() {
+ if (emFactories == null) {
+ log.error("ignore 'clearJpaCache' due to emFactories == null!");
+ return;
+ }
for(EntityManagerFactory emf:emFactories.values()) {
emf.getCache().evictAll();
}
