Fix for ACT-1673

modules/activiti-camel/pom.xml

@@ -59,6 +59,11 @@
       <scope>test</scope>
       <version>2.10.0</version>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.uuid</groupId>
+      <artifactId>java-uuid-generator</artifactId>
+      <scope>test</scope>
+    </dependency>
 
   </dependencies>
 

modules/activiti-camel/src/main/java/org/activiti/camel/CamelBehavior.java

@@ -22,6 +22,8 @@ import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.Expression;
 import org.activiti.engine.impl.bpmn.behavior.BpmnActivityBehavior;
 import org.activiti.engine.impl.context.Context;
+import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
+import org.activiti.engine.impl.pvm.PvmProcessDefinition;
 import org.activiti.engine.impl.pvm.delegate.ActivityBehavior;
 import org.activiti.engine.impl.pvm.delegate.ActivityExecution;
 import org.activiti.spring.SpringProcessEngineConfiguration;
@@ -128,8 +130,12 @@ public abstract class CamelBehavior extends BpmnActivityBehavior implements Acti
   }
 
   protected String getProcessDefinitionKey(ActivityExecution execution) {
-    String id = execution.getActivity().getProcessDefinition().getId();
-    return id.substring(0, id.indexOf(":"));
+    PvmProcessDefinition processDefinition = execution.getActivity().getProcessDefinition();
+    if (processDefinition instanceof ProcessDefinitionEntity) {
+      return ((ProcessDefinitionEntity) processDefinition).getKey();
+    }
+
+    throw new ActivitiException("Unknown implementation of PvmProcessDefinition: " + processDefinition);
   }
   
   protected void setAppropriateCamelContext(ActivityExecution execution) {

modules/activiti-camel/src/main/java/org/activiti/camel/CamelBehaviour.java

@@ -17,7 +17,10 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.activiti.engine.ActivitiException;
 import org.activiti.engine.impl.bpmn.behavior.BpmnActivityBehavior;
+import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
+import org.activiti.engine.impl.pvm.PvmProcessDefinition;
 import org.activiti.engine.impl.pvm.delegate.ActivityBehavior;
 import org.activiti.engine.impl.pvm.delegate.ActivityExecution;
 import org.apache.camel.CamelContext;
@@ -86,9 +89,12 @@ public class CamelBehaviour extends BpmnActivityBehavior implements ActivityBeha
   }
 
   private String getProcessName(ActivityExecution execution) {
-    String id = execution.getActivity().getProcessDefinition().getId();
-    return id.substring(0, id.indexOf(":"));
+    PvmProcessDefinition processDefinition = execution.getActivity().getProcessDefinition();
+    if (processDefinition instanceof ProcessDefinitionEntity) {
+      return ((ProcessDefinitionEntity) processDefinition).getKey();
+    }
 
+    throw new ActivitiException("Unknown implementation of PvmProcessDefinition: " + processDefinition);
   }
 
 }