[1/2] camel git commit: Allow to use CamelCatalog in cache mode

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 556600393 -> 5c4f00876
  refs/heads/master 1d0bc598b -> fe4f4a83c


Allow to use CamelCatalog in cache mode


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

Branch: refs/heads/master
Commit: fe4f4a83c5d77e228c12cf7143d75d5d0942c3da
Parents: 1d0bc59
Author: Claus Ibsen <davscl...@apache.org>
Authored: Wed Dec 30 12:28:37 2015 +0100
Committer: Claus Ibsen <davscl...@apache.org>
Committed: Wed Dec 30 12:28:37 2015 +0100

----------------------------------------------------------------------
 .../apache/camel/catalog/DefaultCamelCatalog.java   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/fe4f4a83/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
----------------------------------------------------------------------
diff --git 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index dc23d3b..3cde7ba 100644
--- 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -380,7 +380,7 @@ public class DefaultCamelCatalog implements CamelCatalog {
 
         String answer = null;
         if (caching) {
-            answer = (String) cache.get(file);
+            answer = (String) cache.get("model-" + file);
         }
 
         if (answer == null) {
@@ -393,7 +393,7 @@ public class DefaultCamelCatalog implements CamelCatalog {
                 }
             }
             if (caching) {
-                cache.put(file, answer);
+                cache.put("model-" + file, answer);
             }
         }
 
@@ -406,7 +406,7 @@ public class DefaultCamelCatalog implements CamelCatalog {
 
         String answer = null;
         if (caching) {
-            answer = (String) cache.get(file);
+            answer = (String) cache.get("component-" + file);
         }
 
         if (answer == null) {
@@ -435,7 +435,7 @@ public class DefaultCamelCatalog implements CamelCatalog {
                 }
             }
             if (caching) {
-                cache.put(file, answer);
+                cache.put("component-" + file, answer);
             }
         }
 
@@ -448,7 +448,7 @@ public class DefaultCamelCatalog implements CamelCatalog {
 
         String answer = null;
         if (caching) {
-            answer = (String) cache.get(file);
+            answer = (String) cache.get("dataformat-" + file);
         }
 
         if (answer == null) {
@@ -477,7 +477,7 @@ public class DefaultCamelCatalog implements CamelCatalog {
                 }
             }
             if (caching) {
-                cache.put(file, answer);
+                cache.put("dataformat-" + file, answer);
             }
         }
 
@@ -490,7 +490,7 @@ public class DefaultCamelCatalog implements CamelCatalog {
 
         String answer = null;
         if (caching) {
-            answer = (String) cache.get(file);
+            answer = (String) cache.get("language-" + file);
         }
 
         if (answer == null) {
@@ -503,7 +503,7 @@ public class DefaultCamelCatalog implements CamelCatalog {
                 }
             }
             if (caching) {
-                cache.put(file, answer);
+                cache.put("language-" + file, answer);
             }
         }