midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge da1cfed05569

This commit is contained in:
Heng Sin Low 2013-06-12 14:33:01 +08:00
parent 1d1782a02c 43d195b4ce
commit 73a562b73c
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.adempiere.base/src/org/compiere/model/PO.java
View File

@ -2003,7 +2003,11 @@ public abstract class PO
Savepoint savepoint = null; Savepoint savepoint = null;
if (m_trxName == null) if (m_trxName == null)
{ {
m_trxName = Trx.createTrxName(LOCAL_TRX_PREFIX + get_TableName()); StringBuilder l_trxname = new StringBuilder(LOCAL_TRX_PREFIX)
.append(get_TableName());
if (l_trxname.length() > 23)
l_trxname.setLength(23);
m_trxName = Trx.createTrxName(l_trxname.toString());
localTrx = Trx.get(m_trxName, true); localTrx = Trx.get(m_trxName, true);
} }
else else

4
org.adempiere.ui.zk/WEB-INF/zk-selenium.xml
View File

@ -2,6 +2,10 @@
<!-- <!--
zk.xml Copyright (C) 2006 Potix Corporation. All Rights Reserved. zk.xml Copyright (C) 2006 Potix Corporation. All Rights Reserved.
Instructions:
Add next parameter to the VM arguments of the server launcher
-Dorg.zkoss.zk.config.path=file://${workspace_loc}/org.adempiere.ui.zk/WEB-INF/zk-selenium.xml
--> -->
<zk> <zk>

2
org.adempiere.ui.zk/WEB-INF/zk.xml
View File

@ -46,7 +46,7 @@
</system-config> </system-config>
--> -->
<!-- uncomment the following for selenium testing --> <!-- uncomment the following for selenium testing / see zk-selenium.xml for an easier way -->
<!-- system-config> <!-- system-config>
<id-generator-class>org.adempiere.webui.AdempiereIdGenerator</id-generator-class> <id-generator-class>org.adempiere.webui.AdempiereIdGenerator</id-generator-class>
</system-config --> </system-config -->

3
org.compiere.db.postgresql.provider/META-INF/pool/server.default.properties
View File

@ -6,7 +6,8 @@ MaxIdleTime=1200
#UnreturnedConnectionTimeout=1800 #UnreturnedConnectionTimeout=1800
#size #size
MaxPoolSize=150 # Verify that MaxPoolSize is lesser than max_connections defined on postgresql.conf
MaxPoolSize=90
InitialPoolSize=10 InitialPoolSize=10
MinPoolSize=5 MinPoolSize=5