Fixing couple of more tests: changing the lookup of process definitions for events

modules/activiti-engine/src/main/java/org/activiti/engine/delegate/event/impl/ActivitiEventDispatcherImpl.java

@@ -111,9 +111,9 @@ public class ActivitiEventDispatcherImpl implements ActivitiEventDispatcher {
                 result = (ProcessDefinitionEntity) entity;
             }
         }
-
+        
         if (result == null && event.getProcessDefinitionId() != null) {
-            result = ProcessDefinitionUtil.getProcessDefinitionEntity(event.getProcessDefinitionId());
+            result = ProcessDefinitionUtil.getProcessDefinitionEntity(event.getProcessDefinitionId(), true);
             if (result != null) {
                 result = Context.getProcessEngineConfiguration().getDeploymentManager().resolveProcessDefinition(result).getProcessDefinitionEntity();
             }

modules/activiti-engine/src/main/java/org/activiti/engine/impl/util/ProcessDefinitionUtil.java

@@ -28,7 +28,19 @@ import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
 public class ProcessDefinitionUtil {
 
     public static ProcessDefinitionEntity getProcessDefinitionEntity(String processDefinitionId) {
-    	return Context.getProcessEngineConfiguration().getDeploymentManager().findDeployedProcessDefinitionById(processDefinitionId);
+    	return getProcessDefinitionEntity(processDefinitionId, false);
+    }
+    
+    public static ProcessDefinitionEntity getProcessDefinitionEntity(String processDefinitionId, boolean checkCacheOnly) {
+    	if (checkCacheOnly) {
+    		ProcessDefinitionCacheEntry cacheEntry = Context.getProcessEngineConfiguration().getProcessDefinitionCache().get(processDefinitionId);
+    		if (cacheEntry != null) {
+    			return cacheEntry.getProcessDefinitionEntity();
+    		}
+    		return null;
+    	} else {
+    		return Context.getProcessEngineConfiguration().getDeploymentManager().findDeployedProcessDefinitionById(processDefinitionId);
+    	}
     }
     
     public static Process getProcess(String processDefinitionId) {

modules/activiti-engine/src/test/java/org/activiti/engine/test/api/runtime/ExecutionQueryTest.java

@@ -111,7 +111,7 @@ public class ExecutionQueryTest extends PluggableActivitiTestCase {
             assertEquals(3, query.list().size());
             assertEquals(3, query.count());
         }
-        assertEquals(1, runtimeService.createExecutionQuery().processInstanceId(sequentialProcessInstanceIds.get(0)).list().size());
+        assertEquals(2, runtimeService.createExecutionQuery().processInstanceId(sequentialProcessInstanceIds.get(0)).list().size());
     }
 
     public void testQueryByParentId() {