svn commit: r1331758 - in /camel/trunk/components/camel-bam: pom.xml src/main/java/org/apache/camel/bam/rules/ProcessRules.java

[davsclaus]

Author: davsclaus
Date: Sat Apr 28 12:37:18 2012
New Revision: 1331758

URL: http://svn.apache.org/viewvc?rev=1331758&view=rev
Log:
CAMEL-5060: Fixed concurenncy issue with bam

Modified:
    camel/trunk/components/camel-bam/pom.xml
    
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ProcessRules.java

Modified: camel/trunk/components/camel-bam/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/pom.xml?rev=1331758&r1=1331757&r2=1331758&view=diff
==============================================================================
--- camel/trunk/components/camel-bam/pom.xml (original)
+++ camel/trunk/components/camel-bam/pom.xml Sat Apr 28 12:37:18 2012
@@ -33,6 +33,7 @@
 
   <properties>
     <camel.osgi.export.pkg>org.apache.camel.bam.*</camel.osgi.export.pkg>
+    <eclipselink-version>2.3.2</eclipselink-version>
   </properties>
 
   <dependencies>
@@ -152,7 +153,7 @@
         <dependency>
           <groupId>org.eclipse.persistence</groupId>
           <artifactId>eclipselink</artifactId>
-          <version>2.0.0</version>
+          <version>${eclipselink-version}</version>
           <scope>test</scope>
         </dependency>
         <dependency>

Modified: 
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ProcessRules.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ProcessRules.java?rev=1331758&r1=1331757&r2=1331758&view=diff
==============================================================================
--- 
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ProcessRules.java
 (original)
+++ 
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ProcessRules.java
 Sat Apr 28 12:37:18 2012
@@ -33,13 +33,13 @@ public class ProcessRules extends Servic
     private ProcessDefinition processDefinition;
     private List<ActivityRules> activities = new ArrayList<ActivityRules>();
 
-    public void processExpired(ActivityState activityState) throws Exception {
+    public synchronized void processExpired(ActivityState activityState) 
throws Exception {
         for (ActivityRules activityRules : activities) {
             activityRules.processExpired(activityState);
         }
     }
 
-    public void processExchange(Exchange exchange, ProcessInstance process) {
+    public synchronized void processExchange(Exchange exchange, 
ProcessInstance process) {
         for (ActivityRules activityRules : activities) {
             activityRules.processExchange(exchange, process);
         }