[OpenbravoERP-commits] devel/pi: Related to issue 38801: Backed out changeset 28cc0cfb9...
details: https://code.openbravo.com/erp/devel/pi/rev/5756317d93ad
changeset: 34225:5756317d93ad
user: Gorka Gil openbravo.com>
date: Thu Jun 21 18:48:23 2018 +0200
summary: Related to issue 38801: Backed out changeset 28cc0cfb94b4 - breaks
the install.source
diffstat:
src/org/openbravo/dal/core/TriggerHandler.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diffs (14 lines):
diff -r 0978edafeb6a -r 5756317d93ad
src/org/openbravo/dal/core/TriggerHandler.java
--- a/src/org/openbravo/dal/core/TriggerHandler.javaThu Jun 21 16:05:13
2018 +
+++ b/src/org/openbravo/dal/core/TriggerHandler.javaThu Jun 21 18:48:23
2018 +0200
@@ -88,8 +88,8 @@
Check.isNotNull(sessionStatus.get(),
"Triggers were not disabled in this session, call disable before
calling this method");
-try (Connection con = OBDal.getInstance().getConnection();
-PreparedStatement ps = con.prepareStatement(getEnableStatement())) {
+Connection con = OBDal.getInstance().getConnection();
+try (PreparedStatement ps = con.prepareStatement(getEnableStatement())) {
ps.execute();
} catch (Exception e) {
throw new OBException("Couldn't enable triggers: ", e);
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/c34295dcdb97 changeset: 34223:c34295dcdb97 user: RM packaging bot openbravo.com> date: Thu Jun 21 15:51:19 2018 + summary: CI: update AD_MODULE to version 34221 details: https://code.openbravo.com/erp/devel/pi/rev/0978edafeb6a changeset: 34224:0978edafeb6a user: RM packaging bot openbravo.com> date: Thu Jun 21 16:05:13 2018 + summary: CI: merge back from main diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 ++-- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 ++-- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +-
[OpenbravoERP-commits] devel/main: 4 new changesets
details: https://code.openbravo.com/erp/devel/main/rev/d674bd5ec9d1
changeset: 34219:d674bd5ec9d1
user: Alvaro Ferraz openbravo.com>
date: Tue Jun 19 10:48:12 2018 +0200
summary: Fixes issue 38785: Perfomance issue in add details button of payment
in window
Performance problem when filtering by order/invoice in Add Payment grid if
there is any record selected.
If no record is selected in the grid, the query performs well.
However, if we filter the grid with some record selected, the query adds an OR
clause that results in a bad execution plan:
AND (fin_paymen0_.FIN_Payment_Scheduledetail_ID IN
('17262A2A1E0E43B69935E7E2BD221BBB', 'F2FE327416A746E0A6735B21363D801D')
OR invoice7_.IsSOTrx = 'Y'
AND invoice7_.C_Currency_ID = '130'
AND businesspa1_.C_BPartner_ID = '812938173C81527EE97A8201FD232C24')
C_BPartner_ID filter has been moved out from the OR clause, fixing the
performance problem:
AND (fin_paymen0_.FIN_Payment_Scheduledetail_ID IN
('17262A2A1E0E43B69935E7E2BD221BBB', 'F2FE327416A746E0A6735B21363D801D')
OR invoice7_.IsSOTrx = 'Y'
AND invoice7_.C_Currency_ID = '130')
AND businesspa1_.C_BPartner_ID = '812938173C81527EE97A8201FD232C24'
details: https://code.openbravo.com/erp/devel/main/rev/3ebd957afffb
changeset: 34220:3ebd957afffb
user: RM packaging bot openbravo.com>
date: Wed Jun 20 10:22:27 2018 +
summary: CI: merge back from main
details: https://code.openbravo.com/erp/devel/main/rev/5ec5054e4cff
changeset: 34221:5ec5054e4cff
user: Javier Armendáriz openbravo.com>
date: Mon Jun 18 18:13:28 2018 +0200
summary: Fixed issue 38766: Audit fields not updated for process request when
scheduling.
When updating process request status, audit fields (updated, updatedby) fields
are not included in update query.
details: https://code.openbravo.com/erp/devel/main/rev/c34295dcdb97
changeset: 34222:c34295dcdb97
user: RM packaging bot openbravo.com>
date: Thu Jun 21 15:51:19 2018 +
summary: CI: update AD_MODULE to version 34221
diffstat:
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 4 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/hqlinjections/AddPaymentOrderInvoicesTransformer.java
| 4 +-
modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 8 +-
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 6 +-
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 4 +-
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml
[OpenbravoERP-commits] devel/pi: Fixes bug 38801: Error in TriggerHandler.enable doesnt...
details: https://code.openbravo.com/erp/devel/pi/rev/28cc0cfb94b4
changeset: 34222:28cc0cfb94b4
user: Augusto Mauch openbravo.com>
date: Thu Jun 21 17:57:27 2018 +0200
summary: Fixes bug 38801: Error in TriggerHandler.enable doesnt leave
triggers disabled
The problem was that if the flush indie TriggerHandler.enable (invoked when
retrieving DAL's connection) failed, the clear method was not
invoked, and the ThreadLocal was not reset. The next time the thread was
reused, it would work with disabled triggers.
Now that doesn't happen anymore because the flush is done inside the try block.
diffstat:
src/org/openbravo/dal/core/TriggerHandler.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diffs (14 lines):
diff -r 5ec5054e4cff -r 28cc0cfb94b4
src/org/openbravo/dal/core/TriggerHandler.java
--- a/src/org/openbravo/dal/core/TriggerHandler.javaMon Jun 18 18:13:28
2018 +0200
+++ b/src/org/openbravo/dal/core/TriggerHandler.javaThu Jun 21 17:57:27
2018 +0200
@@ -88,8 +88,8 @@
Check.isNotNull(sessionStatus.get(),
"Triggers were not disabled in this session, call disable before
calling this method");
-Connection con = OBDal.getInstance().getConnection();
-try (PreparedStatement ps = con.prepareStatement(getEnableStatement())) {
+try (Connection con = OBDal.getInstance().getConnection();
+PreparedStatement ps = con.prepareStatement(getEnableStatement())) {
ps.execute();
} catch (Exception e) {
throw new OBException("Couldn't enable triggers: ", e);
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Fixed issue 38766: Audit fields not updated for proces...
details: https://code.openbravo.com/erp/devel/pi/rev/5ec5054e4cff
changeset: 34221:5ec5054e4cff
user: Javier Armendáriz openbravo.com>
date: Mon Jun 18 18:13:28 2018 +0200
summary: Fixed issue 38766: Audit fields not updated for process request when
scheduling.
When updating process request status, audit fields (updated, updatedby) fields
are not included in update query.
diffstat:
src/org/openbravo/scheduling/OBScheduler.java | 10 ++
src/org/openbravo/scheduling/ProcessMonitor.java | 19 ++-
src/org/openbravo/scheduling/ProcessRequest_data.xsql | 15 +++
src/org/openbravo/scheduling/ProcessRunner.java | 4 ++--
4 files changed, 33 insertions(+), 15 deletions(-)
diffs (168 lines):
diff -r 3ebd957afffb -r 5ec5054e4cff
src/org/openbravo/scheduling/OBScheduler.java
--- a/src/org/openbravo/scheduling/OBScheduler.java Wed Jun 20 10:22:27
2018 +
+++ b/src/org/openbravo/scheduling/OBScheduler.java Mon Jun 18 18:13:28
2018 +0200
@@ -11,7 +11,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2008-2016 Openbravo SLU
+ * All portions are Copyright (C) 2008-2018 Openbravo SLU
* All Rights Reserved.
* Contributor(s): __.
@@ -243,7 +243,7 @@
sched.unscheduleJob(requestId, OB_GROUP);
sched.deleteJob(requestId, OB_GROUP);
ProcessRequestData.update(getConnection(), UNSCHEDULED, null,
sqlDateTimeFormat,
- format(new Date()), requestId);
+ format(new Date()), context.getUser(), requestId);
} catch (final Exception e) {
log.error("An error occurred unscheduling process " + requestId, e);
}
@@ -279,16 +279,18 @@
for (final ProcessRequestData request : data) {
final String requestId = request.id;
+final VariablesSecureApp vars =
ProcessContext.newInstance(request.obContext).toVars();
+
if ("Direct".equals(request.channel)
||
TriggerProvider.TIMING_OPTION_IMMEDIATE.equals(request.timingOption)) {
// do not re-schedule immediate and direct requests that were in
execution last time
// Tomcat stopped
- ProcessRequestData.update(getConnection(), Process.SYSTEM_RESTART,
requestId);
+ ProcessRequestData.update(getConnection(), Process.SYSTEM_RESTART,
vars.getUser(), requestId);
log.debug(request.channel + " run of process id " + request.processId
+ " was scheduled, marked as 'System Restart'");
continue;
}
-final VariablesSecureApp vars =
ProcessContext.newInstance(request.obContext).toVars();
+
try {
final ProcessBundle bundle = ProcessBundle.request(requestId, vars,
getConnection());
schedule(requestId, bundle);
diff -r 3ebd957afffb -r 5ec5054e4cff
src/org/openbravo/scheduling/ProcessMonitor.java
--- a/src/org/openbravo/scheduling/ProcessMonitor.java Wed Jun 20 10:22:27
2018 +
+++ b/src/org/openbravo/scheduling/ProcessMonitor.java Mon Jun 18 18:13:28
2018 +0200
@@ -183,8 +183,10 @@
}
public void triggerFinalized(Trigger trigger) {
+final ProcessBundle bundle = (ProcessBundle)
trigger.getJobDataMap().get(ProcessBundle.KEY);
+String updatedBy = bundle != null ? bundle.getContext().getUser() : "0";
try {
- ProcessRequestData.update(getConnection(), COMPLETE, trigger.getName());
+ ProcessRequestData.update(getConnection(), COMPLETE, updatedBy,
trigger.getName());
} catch (final ServletException e) {
log.error(e.getMessage(), e);
@@ -196,8 +198,14 @@
public void jobUnscheduled(String triggerName, String triggerGroup) {
try {
- ProcessRequestData.update(getConnection(), UNSCHEDULED, null, null,
null, triggerName);
-
+ /*
+ * This method is never called. See for more details:
+ * https://issues.openbravo.com/view.php?id=38804
+ *
+ * Once this issue is fixed, consider whether this method should be
removed or changed to use
+ * an appropriate updatedBy userID
+ */
+ ProcessRequestData.update(getConnection(), UNSCHEDULED, null, null,
null, "0", triggerName);
} catch (final ServletException e) {
log.error(e.getMessage(), e);
} finally {
@@ -319,13 +327,14 @@
private void stopConcurrency(Trigger trigger, JobExecutionContext jec,
String processName) {
try {
+ final ProcessBundle bundle = (ProcessBundle)
jec.getMergedJobDataMap().get(ProcessBundle.KEY);
if (!trigger.mayFireAgain()) {
+String updatedBy = bundle != null ? bundle.getContext().getUser() :
"0";
// This is last execution of this trigger, so set it as complete
-ProcessRequestData.update(getConnection(), COMPLETE,
trigger.getName());
