Author: ningjiang
Date: Tue Mar 16 07:37:28 2010
New Revision: 923601
URL: http://svn.apache.org/viewvc?rev=923601&view=rev
Log:
CAMEL-2552 fix the CamelContext default name's thread safe issue
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterPojoTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=923601&r1=923600&r2=923601&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
Tue Mar 16 07:37:28 2010
@@ -107,7 +107,7 @@ import org.apache.commons.logging.LogFac
public class DefaultCamelContext extends ServiceSupport implements
CamelContext {
private static final transient Log LOG =
LogFactory.getLog(DefaultCamelContext.class);
private static final String NAME_PREFIX = "camel-";
- private static int nameSuffix;
+ private static AtomicInteger nameSuffix = new AtomicInteger(0);
private ClassLoader applicationContextClassLoader;
private boolean routeDefinitionInitiated;
private String name;
@@ -162,7 +162,7 @@ public class DefaultCamelContext extends
public DefaultCamelContext() {
super();
- name = NAME_PREFIX + ++nameSuffix;
+ name = NAME_PREFIX + nameSuffix.incrementAndGet();
// use WebSphere specific resolver if running on WebSphere
if
(WebSpherePackageScanClassResolver.isWebSphereClassLoader(this.getClass().getClassLoader()))
{
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterPojoTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterPojoTest.java?rev=923601&r1=923600&r2=923601&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterPojoTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterPojoTest.java
Tue Mar 16 07:37:28 2010
@@ -95,7 +95,7 @@ public class SplitterPojoTest extends Co
* @return a list containing each part splitted
*/
public List<String> splitBody(String body) {
- // since this is based on an unit test you can of couse
+ // since this is based on an unit test you can of cause
// use different logic for splitting as Camel have out
// of the box support for splitting a String based on comma
// but this is for show and tell, since this is java code
