You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by tk...@apache.org on 2013/03/13 12:19:19 UTC

[1/7] git commit: revert changes

revert changes


Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/8a7214ee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/8a7214ee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/8a7214ee

Branch: refs/heads/master
Commit: 8a7214eec76fb475986d5b037af7674aac53d841
Parents: d8d55d9
Author: tkurz <tk...@apache.org>
Authored: Tue Mar 12 18:55:50 2013 +0100
Committer: tkurz <tk...@apache.org>
Committed: Tue Mar 12 18:55:50 2013 +0100

----------------------------------------------------------------------
 .../config/ConfigurationWebService.java            |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/8a7214ee/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/config/ConfigurationWebService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/config/ConfigurationWebService.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/config/ConfigurationWebService.java
index c195c6e..e81dd6a 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/config/ConfigurationWebService.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/config/ConfigurationWebService.java
@@ -87,19 +87,22 @@ public class ConfigurationWebService {
         Map<String,Object> config = new HashMap<String, Object>();
         config.put("comment",configurationService.getComment(key));
         config.put("type",configurationService.getType(key));
-        config.put("value",configurationService.getStringConfiguration(key));
-        if(config.get("type") != null) {
+        config.put("value",configurationService.getConfiguration(key));
+        /*if(config.get("type") != null) {
             String s = (String)config.get("type");
             int i = s.indexOf("(");
             if(i > -1)  s = s.substring(i);
 
             //try cast
             try {
+                log.info(Class.forName(s).toString());
                 config.put("value",(Class.forName(s).cast(configurationService.getConfiguration(key))));
             } catch (ClassNotFoundException e) {
                 //value is already set as String
+            } catch (ClassCastException e) {
+                //value is already set as String
             }
-        }
+        }    */
         return config;
     }