Merge branch 'lc-0.7.1'

reliatec-gmbh · Feb 12, 2020 · e618f69 · e618f69
2 parents 80d66f8 + 599ab6b
commit e618f69
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.libreclinica</groupId>
         <artifactId>LibreClinica</artifactId>
-      <version>0.7.0</version>
+      <version>0.7.1</version>
     </parent>
     <dependencies>
 		<dependency>

diff --git a/core/src/main/java/org/akaza/openclinica/dao/core/SQLFactory.java b/core/src/main/java/org/akaza/openclinica/dao/core/SQLFactory.java
@@ -148,14 +148,14 @@ public void run(String dbName, ResourceLoader resourceLoader) {
         // key is the public static final sting used above; value is the actual
         // filename
         HashMap fileList = new HashMap();
-        CacheManager cacheManager = new CacheManager();
+        CacheManager cacheManager = null;
 
 
 
 
         try {
-            if(resourceLoader!=null && cacheManager!=null)
-            cacheManager = cacheManager.create(resourceLoader.getResource("classpath:org/akaza/openclinica/ehcache.xml").getInputStream());
+            if(resourceLoader!=null)
+            cacheManager = new CacheManager(resourceLoader.getResource("classpath:org/akaza/openclinica/ehcache.xml").getInputStream());
         } catch (CacheException e) {
 
             e.printStackTrace();

diff --git a/core/src/main/resources/org/akaza/openclinica/ehcache.xml b/core/src/main/resources/org/akaza/openclinica/ehcache.xml
@@ -1,4 +1,4 @@
-<ehcache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../properties/ehcache.xsd" maxBytesLocalHeap="128M"  maxBytesLocalOffHeap="128M">
+<ehcache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../properties/ehcache.xsd">
 <defaultCache 
 	maxElementsInMemory="500000" 
 	eternal="false" 

diff --git a/docs/index.md b/docs/index.md
@@ -1,5 +1,5 @@
 
-test documentation for LibreClinica 0.7.0 pre-release
+test documentation for LibreClinica 0.7.1 pre-release
 
 # LibreClinica test documentation {docsify-ignore}
 

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<groupId>org.libreclinica</groupId>
 	<artifactId>LibreClinica</artifactId>
 	<packaging>pom</packaging>
-	<version>0.7.0</version>
+	<version>0.7.1</version>
 	<name>LibreClinica</name>
 	<description>LibreClinica</description>
 

diff --git a/web/pom.xml b/web/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.libreclinica</groupId>
 		<artifactId>LibreClinica</artifactId>
-		  <version>0.7.0</version>
+		  <version>0.7.1</version>
 	</parent>
 	<dependencies>
 		<dependency>

diff --git a/ws/pom.xml b/ws/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.libreclinica</groupId>
         <artifactId>LibreClinica</artifactId>
-       <version>0.7.0</version>
+       <version>0.7.1</version>
     </parent>
     <dependencies>
     	<dependency>