Author: mriou
Date: Fri Nov 21 08:12:07 2008
New Revision: 719618
URL: http://svn.apache.org/viewvc?rev=719618&view=rev
Log:
Tightening the events filtering, some were going through unnoticed.
Modified:
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java
Modified:
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java?rev=719618&r1=719617&r2=719618&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
(original)
+++
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
Fri Nov 21 08:12:07 2008
@@ -640,15 +640,20 @@
}
public void saveEvent(ProcessInstanceEvent event, ProcessInstanceDAO
instanceDao) {
- markused();
- if (instanceDao != null)
- saveInstanceEvent(event, instanceDao);
- else
- __log.debug("Couldn't find instance to save event, no event
generated!");
+ saveEvent(event, instanceDao, null);
}
- void saveInstanceEvent(ProcessInstanceEvent event, ProcessInstanceDAO
instanceDao) {
- instanceDao.insertBpelEvent(event);
+ public void saveEvent(ProcessInstanceEvent event, ProcessInstanceDAO
instanceDao, List<String> scopeNames) {
+ markused();
+ if (_pconf.isEventEnabled(scopeNames, event.getType())) {
+ // notify the listeners
+ _engine.fireEvent(event);
+
+ if (instanceDao != null)
+ instanceDao.insertBpelEvent(event);
+ else
+ __log.debug("Couldn't find instance to save event, no event
generated!");
+ }
}
/**
Modified:
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java?rev=719618&r1=719617&r2=719618&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
(original)
+++
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
Fri Nov 21 08:12:07 2008
@@ -1015,19 +1015,14 @@
event.setProcessInstanceId(_dao.getInstanceId());
_bpelProcess._debugger.onEvent(event);
- //filter events
+ // filter scopes
List<String> scopeNames = null;
if (event instanceof ScopeEvent) {
scopeNames = ((ScopeEvent) event).getParentScopesNames();
}
- if (_bpelProcess._pconf.isEventEnabled(scopeNames, event.getType())) {
- // notify the listeners
- _bpelProcess._engine.fireEvent(event);
-
- // saving
- _bpelProcess.saveEvent(event, _dao);
- }
+ // saving
+ _bpelProcess.saveEvent(event, _dao, scopeNames);
}
/**
Modified:
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java?rev=719618&r1=719617&r2=719618&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java
(original)
+++
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java
Fri Nov 21 08:12:07 2008
@@ -396,8 +396,8 @@
public void insertBpelEvent(ProcessInstanceEvent event) {
entering("ProcessInstanceDaoImpl.insertBpelEvent");
- // Defer to the BpelDAOConnectionImpl
- BpelDAOConnectionImpl._insertBpelEvent(getSession(), event,
this.getProcess(), this);
+ // Defer to the BpelDAOConnectionImpl
+ BpelDAOConnectionImpl._insertBpelEvent(getSession(), event,
this.getProcess(), this);
}
public EventsFirstLastCountTuple getEventsFirstLastCount() {
