[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/437af0fa8970 changeset: 34743:437af0fa8970 user: RM packaging bot openbravo.com> date: Mon Aug 27 13:25:58 2018 + summary: CI: update AD_MODULE to version 34742 details: https://code.openbravo.com/erp/devel/pi/rev/15bff644ef4d changeset: 34744:15bff644ef4d user: RM packaging bot openbravo.com> date: Mon Aug 27 13:39:41 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 +- modules/org.openbravo.v3.datasets/src-db/database/
[OpenbravoERP-commits] devel/main: 3 new changesets
details: https://code.openbravo.com/erp/devel/main/rev/e96afc22b34a changeset: 34741:e96afc22b34a user: RM packaging bot openbravo.com> date: Thu Aug 23 02:07:25 2018 + summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/49aec8332d23 changeset: 34742:49aec8332d23 user: Augusto Mauch openbravo.com> date: Mon Aug 27 11:23:10 2018 +0200 summary: Related with issue 38903: Backs out changeset e17a08d06f29, change too central The backed out changeset could have an impact on performance. It changed the initialization of OBContext, which is done many times, and a small impact on performance can add up. It will be replaced by a fix that will address the specific event handler where the issue was being reproduced. details: https://code.openbravo.com/erp/devel/main/rev/437af0fa8970 changeset: 34743:437af0fa8970 user: RM packaging bot openbravo.com> date: Mon Aug 27 13:25:58 2018 + summary: CI: update AD_MODULE to version 34742 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
[OpenbravoERP-commits] devel/pi: Related with issue 38903: Backs out changeset e17a08d0...
details: https://code.openbravo.com/erp/devel/pi/rev/49aec8332d23
changeset: 34742:49aec8332d23
user: Augusto Mauch openbravo.com>
date: Mon Aug 27 11:23:10 2018 +0200
summary: Related with issue 38903: Backs out changeset e17a08d06f29, change
too central
The backed out changeset could have an impact on performance. It changed the
initialization of
OBContext, which is done many times, and a small impact on performance can add
up.
It will be replaced by a fix that will address the specific event handler where
the issue was
being reproduced.
diffstat:
src-test/src/org/openbravo/test/dal/OBContextTest.java | 48 --
src/org/openbravo/dal/core/OBContext.java | 31 +++---
2 files changed, 10 insertions(+), 69 deletions(-)
diffs (159 lines):
diff -r e96afc22b34a -r 49aec8332d23
src-test/src/org/openbravo/test/dal/OBContextTest.java
--- a/src-test/src/org/openbravo/test/dal/OBContextTest.javaThu Aug 23
02:07:25 2018 +
+++ b/src-test/src/org/openbravo/test/dal/OBContextTest.javaMon Aug 27
11:23:10 2018 +0200
@@ -22,12 +22,8 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import org.hibernate.LazyInitializationException;
import org.junit.Test;
-import org.openbravo.base.model.Entity;
-import org.openbravo.base.structure.BaseOBObject;
import org.openbravo.dal.core.OBContext;
-import org.openbravo.dal.service.OBDal;
import org.openbravo.test.base.OBBaseTest;
/**
@@ -179,50 +175,6 @@
OBContext.restorePreviousMode();
}
- /**
- * Test that checks the first level properties of all the properties stored
in the OBContext
- * (user, organization, language, role, warehouse) are not proxies See issue
- * https://issues.openbravo.com/view.php?id=38903
- */
- @Test
- public void testBaseObjectsInContextAreNotProxies() {
-setTestUserContext();
-OBDal.getInstance().commitAndClose();
-assertTrue("User should be initialized",
firstLevelPropertiesAreInitialized(OBContext
-.getOBContext().getUser()));
-assertTrue("Organization should be initialized",
firstLevelPropertiesAreInitialized(OBContext
-.getOBContext().getCurrentOrganization()));
-assertTrue("Language should be initialized",
firstLevelPropertiesAreInitialized(OBContext
-.getOBContext().getLanguage()));
-assertTrue("Role should be initialized",
firstLevelPropertiesAreInitialized(OBContext
-.getOBContext().getRole()));
-assertTrue("Warehouse should be initialized",
firstLevelPropertiesAreInitialized(OBContext
-.getOBContext().getWarehouse()));
- }
-
- private boolean firstLevelPropertiesAreInitialized(BaseOBObject bob) {
-if (bob == null) {
- return true;
-}
-try {
- OBContext.setAdminMode(true);
- Entity entity = bob.getEntity();
- // invoke the getIdentifier method on all first level properties that
return BaseOBObjects
- // if they are proxies, a LazyInitializationException will be thrown
- entity.getProperties().stream() //
- .filter(property -> !property.isOneToMany()) //
- .map(property -> bob.get(property.getName())) //
- .filter(BaseOBObject.class::isInstance) //
- .map(BaseOBObject.class::cast) //
- .forEach(referencedBob -> referencedBob.getIdentifier());
-} catch (LazyInitializationException e) {
- return false;
-} finally {
- OBContext.restorePreviousMode();
-}
-return true;
- }
-
// the scenario:
// thread1 T1
// thread2 T2
diff -r e96afc22b34a -r 49aec8332d23 src/org/openbravo/dal/core/OBContext.java
--- a/src/org/openbravo/dal/core/OBContext.java Thu Aug 23 02:07:25 2018 +
+++ b/src/org/openbravo/dal/core/OBContext.java Mon Aug 27 11:23:10 2018 +0200
@@ -39,7 +39,6 @@
import org.hibernate.Hibernate;
import org.hibernate.query.Query;
import org.openbravo.base.exception.OBSecurityException;
-import org.openbravo.base.model.Entity;
import org.openbravo.base.provider.OBNotSingleton;
import org.openbravo.base.provider.OBProvider;
import org.openbravo.base.structure.BaseOBObject;
@@ -713,12 +712,10 @@
}
public void setCurrentClient(Client currentClient) {
-initializeFirstLevelProperties(currentClient);
this.currentClient = currentClient;
}
public void setCurrentOrganization(Organization currentOrganization) {
-initializeFirstLevelProperties(currentOrganization);
this.currentOrganization = currentOrganization;
}
@@ -727,7 +724,6 @@
}
public void setLanguage(Language language) {
-initializeFirstLevelProperties(language);
this.language = language;
setRTL(language.isRTLLanguage());
}
@@ -870,6 +866,16 @@
getAdminModeStack(AdminType.ADMIN_MODE).push(am);
try {
setUser(u);
+ Hibernate.initialize(getUser().getClient());
+ Hibernate.initialize(getUser().getOrganization());
+ Hibernate.initialize(getUser().getDefaultOrganization()
