Author: ningjiang
Date: Sat Oct 27 06:09:45 2012
New Revision: 1402746
URL: http://svn.apache.org/viewvc?rev=1402746&view=rev
Log:
CAMEL-5747 clean up the cachedMap when restart the properties component with
thanks to Daniel
Added:
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentRestartTest.java
- copied unchanged from r1402738,
camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentRestartTest.java
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1402738
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java?rev=1402746&r1=1402745&r2=1402746&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
(original)
+++
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
Sat Oct 27 06:09:45 2012
@@ -27,7 +27,6 @@ import org.apache.camel.Endpoint;
import org.apache.camel.impl.DefaultComponent;
import org.apache.camel.util.LRUSoftCache;
import org.apache.camel.util.ObjectHelper;
-import org.apache.camel.util.ServiceHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -281,14 +280,8 @@ public class PropertiesComponent extends
}
@Override
- protected void doStart() throws Exception {
- ServiceHelper.startService(cacheMap);
- super.doStart();
- }
-
- @Override
protected void doStop() throws Exception {
- ServiceHelper.stopService(cacheMap);
+ cacheMap.clear();
super.doStop();
}