details: https://code.openbravo.com/erp/devel/pi/rev/616685f33ea2
changeset: 19666:616685f33ea2
user: Augusto Mauch <augusto.mauch <at> openbravo.com>
date: Wed Feb 13 14:44:20 2013 +0100
summary: Fixes issue 23060: Disables event handlers using session info
Instead of querying the database each time an event handlers is going to be
executed to check is the system is importing data, that information is taken
from the session using TriggerHandler.getInstance().isDisabled().
diffstat:
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/event/EntityPersistenceEventObserver.java
| 4 +-
src/org/openbravo/erpCommon/utility/Utility.java
| 15 ----------
2 files changed, 2 insertions(+), 17 deletions(-)
diffs (58 lines):
diff -r 788979b3e20e -r 616685f33ea2
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/event/EntityPersistenceEventObserver.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/event/EntityPersistenceEventObserver.java
Wed Feb 13 13:02:57 2013 +0100
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/event/EntityPersistenceEventObserver.java
Wed Feb 13 14:44:20 2013 +0100
@@ -19,7 +19,7 @@
package org.openbravo.client.kernel.event;
import org.openbravo.base.model.Entity;
-import org.openbravo.erpCommon.utility.Utility;
+import org.openbravo.dal.core.TriggerHandler;
/**
* A base listener which can be extended to perform specific actions when
persisting entities.
@@ -47,7 +47,7 @@
*/
protected boolean isValidEvent(EntityPersistenceEvent event) {
// Disable event handlers if data is being imported
- if (Utility.isImporting()) {
+ if (TriggerHandler.getInstance().isDisabled()) {
return false;
}
final Entity targetEntity = event.getTargetInstance().getEntity();
diff -r 788979b3e20e -r 616685f33ea2
src/org/openbravo/erpCommon/utility/Utility.java
--- a/src/org/openbravo/erpCommon/utility/Utility.java Wed Feb 13 13:02:57
2013 +0100
+++ b/src/org/openbravo/erpCommon/utility/Utility.java Wed Feb 13 14:44:20
2013 +0100
@@ -72,7 +72,6 @@
import org.openbravo.base.secureApp.VariablesSecureApp;
import org.openbravo.dal.core.OBContext;
import org.openbravo.dal.service.OBDal;
-import org.openbravo.dal.service.OBQuery;
import org.openbravo.data.FieldProvider;
import org.openbravo.data.Sqlc;
import org.openbravo.database.ConnectionProvider;
@@ -80,7 +79,6 @@
import org.openbravo.erpCommon.obps.ActivationKey;
import org.openbravo.erpCommon.obps.ActivationKey.LicenseClass;
import org.openbravo.erpCommon.reference.PInstanceProcessData;
-import org.openbravo.model.ad.access.SessionStatus;
import org.openbravo.model.ad.system.ClientInformation;
import org.openbravo.model.ad.system.SystemInformation;
import org.openbravo.model.ad.ui.Process;
@@ -2602,17 +2600,4 @@
OBContext.restorePreviousMode();
}
}
-
- /**
- * Checks if the database is being imported.
- *
- *
- * @return true if data is being imported, false if not
- */
- public static boolean isImporting() {
- OBQuery<SessionStatus> obq =
OBDal.getInstance().createQuery(SessionStatus.class,
- " importing='Y'");
- return (obq.count() > 0);
- }
-
}
------------------------------------------------------------------------------
Free Next-Gen Firewall Hardware Offer
Buy your Sophos next-gen firewall before the end March 2013
and get the hardware for free! Learn more.
http://p.sf.net/sfu/sophos-d2d-feb
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
