You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2014/06/24 17:22:25 UTC
[2/3] git commit: CAMEL-7351: camel-cache - Should create default
cache manager factory if no specific config file configured
CAMEL-7351: camel-cache - Should create default cache manager factory if no specific config file configured
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3d31e1ee
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3d31e1ee
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3d31e1ee
Branch: refs/heads/camel-2.12.x
Commit: 3d31e1ee387ff13b8ee4af7c6c121185d9e34352
Parents: 7678406
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jun 24 17:21:19 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jun 24 17:21:54 2014 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/component/cache/CacheComponent.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3d31e1ee/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheComponent.java b/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheComponent.java
index 21f1bf1..82ce9f8 100755
--- a/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheComponent.java
+++ b/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheComponent.java
@@ -95,11 +95,12 @@ public class CacheComponent extends DefaultComponent {
protected void doStart() throws Exception {
super.doStart();
if (cacheManagerFactory == null) {
- InputStream is = null;
if (configurationFile != null) {
- is = ResourceHelper.resolveMandatoryResourceAsInputStream(getCamelContext().getClassResolver(), configurationFile);
+ InputStream is = ResourceHelper.resolveMandatoryResourceAsInputStream(getCamelContext().getClassResolver(), configurationFile);
+ cacheManagerFactory = new DefaultCacheManagerFactory(is, configurationFile);
+ } else {
+ cacheManagerFactory = new DefaultCacheManagerFactory();
}
- cacheManagerFactory = new DefaultCacheManagerFactory(is, configurationFile);
}
ServiceHelper.startService(cacheManagerFactory);
}