Author: mriou
Date: Fri Nov 21 08:26:26 2008
New Revision: 719624
URL: http://svn.apache.org/viewvc?rev=719624&view=rev
Log:
Tightening the events filtering, some were going through unnoticed.
Modified:
ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/ODEProcess.java
Modified:
ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
URL:
http://svn.apache.org/viewvc/ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java?rev=719624&r1=719623&r2=719624&view=diff
==============================================================================
---
ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
(original)
+++
ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
Fri Nov 21 08:26:26 2008
@@ -739,13 +739,7 @@
scopeNames = ((ScopeEvent) event).getParentScopesNames();
}
- if (_bpelProcess._pconf.isEventEnabled(scopeNames, event.getType())) {
- // notify the listeners
- _bpelProcess._server.fireEvent(event);
-
- // saving
- _bpelProcess.saveEvent(event, _dao);
- }
+ _bpelProcess.saveEvent(event, _dao, scopeNames);
}
public void noreply(String mexId, FaultInfo optionalFaultData) {
Modified:
ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/ODEProcess.java
URL:
http://svn.apache.org/viewvc/ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/ODEProcess.java?rev=719624&r1=719623&r2=719624&view=diff
==============================================================================
--- ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/ODEProcess.java
(original)
+++ ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/ODEProcess.java
Fri Nov 21 08:26:26 2008
@@ -783,16 +783,20 @@
}
public void saveEvent(ProcessInstanceEvent event, ProcessInstanceDAO
instanceDao) {
+ saveEvent(event, instanceDao, null);
+ }
+ public void saveEvent(ProcessInstanceEvent event, ProcessInstanceDAO
instanceDao, List<String> scopeNames) {
markused();
- if (instanceDao != null)
- saveInstanceEvent(event, instanceDao);
- else
- __log.debug("Couldn't find instance to save event, no event
generated!");
+ if (_pconf.isEventEnabled(scopeNames, event.getType())) {
+ // notify the listeners
+ _server.fireEvent(event);
+ if (instanceDao != null)
+ instanceDao.insertBpelEvent(event);
+ else
+ __log.debug("Couldn't find instance to save event, no event
generated!");
+ }
}
- void saveInstanceEvent(ProcessInstanceEvent event, ProcessInstanceDAO
instanceDao) {
- instanceDao.insertBpelEvent(event);
- }
/**
* Ask the process to dehydrate.
