You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2014/06/18 21:02:42 UTC

git commit: fixing AIRAVATA-1297

Repository: airavata
Updated Branches:
  refs/heads/master 49f3b111c -> 2bcadf554


fixing AIRAVATA-1297


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/2bcadf55
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/2bcadf55
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/2bcadf55

Branch: refs/heads/master
Commit: 2bcadf5540be6f7e39f9553f4a4f81ab42070140
Parents: 49f3b11
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Wed Jun 18 15:02:37 2014 -0400
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Wed Jun 18 15:02:37 2014 -0400

----------------------------------------------------------------------
 .../org/apache/airavata/persistance/registry/jpa/JPAConstants.java | 2 +-
 .../apache/airavata/persistance/registry/jpa/resources/Utils.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/2bcadf55/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/JPAConstants.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/JPAConstants.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/JPAConstants.java
index bba422e..56d6030 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/JPAConstants.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/JPAConstants.java
@@ -28,5 +28,5 @@ public class JPAConstants {
 	public static final String KEY_JDBC_DRIVER = "registry.jdbc.driver";
 	public static final String KEY_DERBY_START_ENABLE = "start.derby.server.mode";
     public static final String VALIDATION_QUERY = "validationQuery";
-    public static final String JPA_CACHE_SIZE = "jpa.connection.properties";
+    public static final String JPA_CACHE_SIZE = "jpa.cache.size";
 }

http://git-wip-us.apache.org/repos/asf/airavata/blob/2bcadf55/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
index a94efd5..05f13c4 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
@@ -79,7 +79,7 @@ public class Utils {
     public static int getJPACacheSize (){
         try {
             String cache = ServerSettings.getSetting(JPAConstants.JPA_CACHE_SIZE, "5000");
-            return Integer.valueOf(cache);
+            return Integer.parseInt(cache);
         }catch (Exception e){
             logger.error(e.getMessage(), e);
             return -1;