From d7baae0eeeb8d624380a6ef55b06ac1a09a8635a Mon Sep 17 00:00:00 2001 From: Yamel Senih Date: Sat, 5 Feb 2022 15:31:49 -0400 Subject: [PATCH 01/13] Update CCache.java Validate NPE --- base/src/org/compiere/util/CCache.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/src/org/compiere/util/CCache.java b/base/src/org/compiere/util/CCache.java index 4c5531a4cc3..4d463b46b89 100644 --- a/base/src/org/compiere/util/CCache.java +++ b/base/src/org/compiere/util/CCache.java @@ -232,7 +232,7 @@ public V get(Object key) { expire(); V value = super.get(key); - if(PO.class.isAssignableFrom(value.getClass())) { + if(value != null && PO.class.isAssignableFrom(value.getClass())) { PO entity = (PO) value; if(entity.get_TrxName() != null) { throw new AdempiereException("Transaction not allowed for cache objects PO: " + entity); From bf21b5d7ad351d26cd92468fdacf22a90d4c4f3d Mon Sep 17 00:00:00 2001 From: Yamel Senih Date: Sat, 5 Feb 2022 18:18:38 -0400 Subject: [PATCH 02/13] Remove bad validation by transaction name --- base/src/org/compiere/model/MTable.java | 7 +------ base/src/org/compiere/model/PO.java | 3 ++- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/base/src/org/compiere/model/MTable.java b/base/src/org/compiere/model/MTable.java index 383a830e738..fe1193ad7b4 100644 --- a/base/src/org/compiere/model/MTable.java +++ b/base/src/org/compiere/model/MTable.java @@ -171,12 +171,7 @@ public static MTable get (Properties ctx, String tableName) if(tableId <= 0) { return null; } - MTable retValue = MTable.get(ctx, tableId); - if (retValue != null) { - Integer key = new Integer (retValue.getAD_Table_ID()); - s_cache.put (key, retValue); - } - return retValue; + return MTable.get(ctx, tableId); } // get /** diff --git a/base/src/org/compiere/model/PO.java b/base/src/org/compiere/model/PO.java index 4c5788a48ad..2ed13b63b21 100644 --- a/base/src/org/compiere/model/PO.java +++ b/base/src/org/compiere/model/PO.java @@ -3848,7 +3848,8 @@ public void set_TrxName (String trxName) */ public String get_TrxName() { - if(isCachedEntity()) { + if(isCachedEntity() + && m_trxName != null) { throw new AdempiereException("Transaction not allowed for cache objects PO: " + this); } return m_trxName; From 3ea7250f0b154b9b6982be85635a6dc4fe8db472 Mon Sep 17 00:00:00 2001 From: Yamel Senih Date: Sat, 5 Feb 2022 22:41:50 -0400 Subject: [PATCH 03/13] Minor change --- base/src/org/compiere/model/MTable.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/base/src/org/compiere/model/MTable.java b/base/src/org/compiere/model/MTable.java index fe1193ad7b4..3ee449dbae5 100644 --- a/base/src/org/compiere/model/MTable.java +++ b/base/src/org/compiere/model/MTable.java @@ -163,8 +163,7 @@ public static MTable get (Properties ctx, int AD_Table_ID) * @param tableName case insensitive table name * @return Table */ - public static MTable get (Properties ctx, String tableName) - { + public static MTable get (Properties ctx, String tableName) { if (tableName == null) return null; int tableId = getTable_ID(tableName); From 60ec79454b9cb9cf5b727c7bc5a770ad16c900c2 Mon Sep 17 00:00:00 2001 From: EdwinBetanc0urt Date: Sun, 6 Feb 2022 00:43:35 -0400 Subject: [PATCH 04/13] fix: Warning 'includeantruntime' was not set. --- JasperReports/build.xml | 2 +- JasperReportsWebApp/build.xml | 2 +- client/build.xml | 2 +- extend/build.xml | 2 +- install/build.xml | 2 +- org.adempiere.asset/build.xml | 2 +- org.adempiere.production/build.xml | 2 +- org.adempiere.webservice/build.xml | 3 ++- org.compiere.mobile/build.xml | 3 ++- org.eevolution.cashflow/build.xml | 2 +- org.eevolution.fleet/build.xml | 2 +- org.eevolution.freight/build.xml | 4 ++-- org.eevolution.hr_and_payroll/build.xml | 4 ++-- org.eevolution.manufacturing/build.xml | 4 ++-- org.eevolution.warehouse/build.xml | 4 ++-- org.spin.finance_management/build.xml | 3 ++- org.spin.hr_time_and_attendance/build.xml | 2 +- org.spin.loan_management/build.xml | 4 ++-- org.spin.store/build.xml | 2 +- serverApps/build.xml | 3 ++- serverRoot/build.xml | 3 ++- sqlj/build.xml | 3 ++- tools/build.xml | 2 +- webCM/build.xml | 3 ++- zkwebui/build.xml | 3 ++- 25 files changed, 38 insertions(+), 30 deletions(-) diff --git a/JasperReports/build.xml b/JasperReports/build.xml index fce2f34ece6..9b979230b50 100644 --- a/JasperReports/build.xml +++ b/JasperReports/build.xml @@ -55,7 +55,7 @@ - + diff --git a/JasperReportsWebApp/build.xml b/JasperReportsWebApp/build.xml index b71ae09e519..2b382653c8f 100644 --- a/JasperReportsWebApp/build.xml +++ b/JasperReportsWebApp/build.xml @@ -29,7 +29,7 @@ ------ Compiling webApp - + diff --git a/client/build.xml b/client/build.xml index ef1a0b9cb33..fea68f26eb3 100644 --- a/client/build.xml +++ b/client/build.xml @@ -64,7 +64,7 @@ - + diff --git a/extend/build.xml b/extend/build.xml index 38713ed3dac..fa89478e872 100644 --- a/extend/build.xml +++ b/extend/build.xml @@ -48,7 +48,7 @@ - + diff --git a/install/build.xml b/install/build.xml index 9120a82466d..ad52c3b3c83 100644 --- a/install/build.xml +++ b/install/build.xml @@ -61,7 +61,7 @@ - + diff --git a/org.adempiere.asset/build.xml b/org.adempiere.asset/build.xml index 6e592867c0e..9109af75a03 100644 --- a/org.adempiere.asset/build.xml +++ b/org.adempiere.asset/build.xml @@ -42,7 +42,7 @@ - + diff --git a/org.adempiere.production/build.xml b/org.adempiere.production/build.xml index e3e54977bdd..c893db6f5c1 100644 --- a/org.adempiere.production/build.xml +++ b/org.adempiere.production/build.xml @@ -56,7 +56,7 @@ - + diff --git a/org.adempiere.webservice/build.xml b/org.adempiere.webservice/build.xml index 01f534a8131..e3ccdd7f339 100755 --- a/org.adempiere.webservice/build.xml +++ b/org.adempiere.webservice/build.xml @@ -72,7 +72,8 @@ destdir="${classes.dir}" debug="${compile.debug}" deprecation="${compile.deprecation}" - optimize="${compile.optimize}"> + optimize="${compile.optimize}" + includeantruntime="false"> diff --git a/org.compiere.mobile/build.xml b/org.compiere.mobile/build.xml index 50d1eff0c32..a957f03bb4e 100644 --- a/org.compiere.mobile/build.xml +++ b/org.compiere.mobile/build.xml @@ -52,7 +52,8 @@ destdir="${classes.dir}" debug="${compile.debug}" deprecation="${compile.deprecation}" - optimize="${compile.optimize}"> + optimize="${compile.optimize}" + includeantruntime="false"> diff --git a/org.eevolution.cashflow/build.xml b/org.eevolution.cashflow/build.xml index d5bb4b91738..71ad1acde1d 100644 --- a/org.eevolution.cashflow/build.xml +++ b/org.eevolution.cashflow/build.xml @@ -53,7 +53,7 @@ - + diff --git a/org.eevolution.fleet/build.xml b/org.eevolution.fleet/build.xml index 8b661c0466b..f9d2e60513e 100644 --- a/org.eevolution.fleet/build.xml +++ b/org.eevolution.fleet/build.xml @@ -45,7 +45,7 @@ - + diff --git a/org.eevolution.freight/build.xml b/org.eevolution.freight/build.xml index 022826db95c..9746c4a9cb7 100644 --- a/org.eevolution.freight/build.xml +++ b/org.eevolution.freight/build.xml @@ -45,7 +45,7 @@ - + @@ -71,7 +71,7 @@ - + diff --git a/org.eevolution.hr_and_payroll/build.xml b/org.eevolution.hr_and_payroll/build.xml index b64b13435c1..4b9b51219c5 100755 --- a/org.eevolution.hr_and_payroll/build.xml +++ b/org.eevolution.hr_and_payroll/build.xml @@ -51,7 +51,7 @@ - + @@ -78,7 +78,7 @@ description="compile the source " > - + diff --git a/org.eevolution.manufacturing/build.xml b/org.eevolution.manufacturing/build.xml index 41ea7a2d891..77179e7fdfc 100644 --- a/org.eevolution.manufacturing/build.xml +++ b/org.eevolution.manufacturing/build.xml @@ -52,7 +52,7 @@ - + @@ -76,7 +76,7 @@ - + diff --git a/org.eevolution.warehouse/build.xml b/org.eevolution.warehouse/build.xml index 76761edccf7..c2cdf1b292f 100644 --- a/org.eevolution.warehouse/build.xml +++ b/org.eevolution.warehouse/build.xml @@ -46,7 +46,7 @@ - + @@ -73,7 +73,7 @@ - + diff --git a/org.spin.finance_management/build.xml b/org.spin.finance_management/build.xml index 1b45d1a718f..0367b9f6311 100644 --- a/org.spin.finance_management/build.xml +++ b/org.spin.finance_management/build.xml @@ -48,7 +48,8 @@ description="compile the source "> + destdir="${build}" + includeantruntime="false"> diff --git a/org.spin.hr_time_and_attendance/build.xml b/org.spin.hr_time_and_attendance/build.xml index 99e42ad53a5..298da6388f9 100644 --- a/org.spin.hr_time_and_attendance/build.xml +++ b/org.spin.hr_time_and_attendance/build.xml @@ -47,7 +47,7 @@ - + diff --git a/org.spin.loan_management/build.xml b/org.spin.loan_management/build.xml index ac88089f38c..23d4ddf57f7 100644 --- a/org.spin.loan_management/build.xml +++ b/org.spin.loan_management/build.xml @@ -51,7 +51,7 @@ - + @@ -77,7 +77,7 @@ - + diff --git a/org.spin.store/build.xml b/org.spin.store/build.xml index 5efd1e290a4..6c56f6152c1 100644 --- a/org.spin.store/build.xml +++ b/org.spin.store/build.xml @@ -45,7 +45,7 @@ - + diff --git a/serverApps/build.xml b/serverApps/build.xml index b9a7a6d94f8..c7ef541b84b 100644 --- a/serverApps/build.xml +++ b/serverApps/build.xml @@ -57,7 +57,8 @@ debug="on" deprecation="off" optimize="on" - classpathref="web.path"> + classpathref="web.path" + includeantruntime="false"> diff --git a/serverRoot/build.xml b/serverRoot/build.xml index e3da98a166e..a73b0c9e9fa 100644 --- a/serverRoot/build.xml +++ b/serverRoot/build.xml @@ -79,7 +79,8 @@ debug="on" deprecation="off" optimize="on" - classpathref="base.path"> + classpathref="base.path" + includeantruntime="false"> diff --git a/sqlj/build.xml b/sqlj/build.xml index ba1523352e6..a601a6aece1 100644 --- a/sqlj/build.xml +++ b/sqlj/build.xml @@ -36,7 +36,8 @@ + debug="on" + includeantruntime="false"> diff --git a/tools/build.xml b/tools/build.xml index 4d34eb5c219..492a6fb60c6 100644 --- a/tools/build.xml +++ b/tools/build.xml @@ -67,7 +67,7 @@ - + diff --git a/webCM/build.xml b/webCM/build.xml index edbba8f9ee8..3036c682ead 100644 --- a/webCM/build.xml +++ b/webCM/build.xml @@ -52,7 +52,8 @@ debug="on" deprecation="off" optimize="on" - classpathref="web.path"> + classpathref="web.path" + includeantruntime="false"> diff --git a/zkwebui/build.xml b/zkwebui/build.xml index 3ae18dcc97d..8086774fdb9 100644 --- a/zkwebui/build.xml +++ b/zkwebui/build.xml @@ -65,7 +65,8 @@ destdir="${classes.dir}" debug="${compile.debug}" deprecation="${compile.deprecation}" - optimize="${compile.optimize}"> + optimize="${compile.optimize}" + includeantruntime="false"> From 2280049723197e1d6bddc21efb0b8f1d58fcb781 Mon Sep 17 00:00:00 2001 From: EdwinBetanc0urt Date: Sun, 6 Feb 2022 01:50:02 -0400 Subject: [PATCH 05/13] fix runtime. --- com.kkalice.adempiere.migrate/build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.kkalice.adempiere.migrate/build.xml b/com.kkalice.adempiere.migrate/build.xml index 2382920eef8..6c5df813587 100644 --- a/com.kkalice.adempiere.migrate/build.xml +++ b/com.kkalice.adempiere.migrate/build.xml @@ -87,7 +87,7 @@ - + From bdb9c26f7d8689f02a33256d899e8fa6045fa21d Mon Sep 17 00:00:00 2001 From: Yamel Senih Date: Sun, 6 Feb 2022 19:39:19 -0400 Subject: [PATCH 06/13] Remove unnecessary throw for cache --- base/src/org/compiere/model/MSequence.java | 3 --- base/src/org/compiere/model/PO.java | 3 +-- base/src/org/compiere/util/CCache.java | 8 -------- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/base/src/org/compiere/model/MSequence.java b/base/src/org/compiere/model/MSequence.java index 3ad0c171cd0..0f8cfc320e9 100644 --- a/base/src/org/compiere/model/MSequence.java +++ b/base/src/org/compiere/model/MSequence.java @@ -156,9 +156,6 @@ else if (DB.isOracle()) // Get the table MTable table = MTable.get(Env.getCtx(), TableName); - // Set the transaction from Persistence Object avoid null transaction error - if (table.get_TrxName() == null && trxName != null) - table.set_TrxName(trxName); int AD_Sequence_ID = rs.getInt(4); boolean gotFromHTTP = false; diff --git a/base/src/org/compiere/model/PO.java b/base/src/org/compiere/model/PO.java index 2ed13b63b21..4c5788a48ad 100644 --- a/base/src/org/compiere/model/PO.java +++ b/base/src/org/compiere/model/PO.java @@ -3848,8 +3848,7 @@ public void set_TrxName (String trxName) */ public String get_TrxName() { - if(isCachedEntity() - && m_trxName != null) { + if(isCachedEntity()) { throw new AdempiereException("Transaction not allowed for cache objects PO: " + this); } return m_trxName; diff --git a/base/src/org/compiere/util/CCache.java b/base/src/org/compiere/util/CCache.java index 4d463b46b89..c74df0dfbe0 100644 --- a/base/src/org/compiere/util/CCache.java +++ b/base/src/org/compiere/util/CCache.java @@ -22,8 +22,6 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; - -import org.adempiere.exceptions.AdempiereException; import org.compiere.model.PO; /** @@ -234,9 +232,6 @@ public V get(Object key) V value = super.get(key); if(value != null && PO.class.isAssignableFrom(value.getClass())) { PO entity = (PO) value; - if(entity.get_TrxName() != null) { - throw new AdempiereException("Transaction not allowed for cache objects PO: " + entity); - } entity.setIsCachedEntity(true); } return value; @@ -257,9 +252,6 @@ public V put (K key, V value) } if(PO.class.isAssignableFrom(value.getClass())) { PO entity = (PO) value; - if(entity.get_TrxName() != null) { - throw new AdempiereException("Transaction not allowed for cache objects PO: " + entity); - } entity.setIsCachedEntity(true); } return super.put (key, value); From 51a5de048ed02ed2b380dbaf221d241603bda0f1 Mon Sep 17 00:00:00 2001 From: Yamel Senih Date: Mon, 7 Feb 2022 07:17:37 -0400 Subject: [PATCH 07/13] Remove line --- base/src/org/compiere/model/MSequence.java | 1 - 1 file changed, 1 deletion(-) diff --git a/base/src/org/compiere/model/MSequence.java b/base/src/org/compiere/model/MSequence.java index 0f8cfc320e9..d56747e5cc2 100644 --- a/base/src/org/compiere/model/MSequence.java +++ b/base/src/org/compiere/model/MSequence.java @@ -156,7 +156,6 @@ else if (DB.isOracle()) // Get the table MTable table = MTable.get(Env.getCtx(), TableName); - int AD_Sequence_ID = rs.getInt(4); boolean gotFromHTTP = false; From 5cd8536754c6696d1ce156d8f8575c4e29232ea8 Mon Sep 17 00:00:00 2001 From: Yamel Senih Date: Mon, 7 Feb 2022 08:31:14 -0400 Subject: [PATCH 08/13] Remove transaction of table --- base/src/org/compiere/model/MTable.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/src/org/compiere/model/MTable.java b/base/src/org/compiere/model/MTable.java index 3ee449dbae5..d3db1d2f959 100644 --- a/base/src/org/compiere/model/MTable.java +++ b/base/src/org/compiere/model/MTable.java @@ -441,7 +441,7 @@ public List getColumnsAsList(boolean requery) { return columns; } // Default find - columns = new Query(getCtx(), I_AD_Column.Table_Name, "AD_Table_ID = ?", get_TrxName()) + columns = new Query(getCtx(), I_AD_Column.Table_Name, "AD_Table_ID = ?", null) .setParameters(getAD_Table_ID()) .setOrderBy(I_AD_Column.COLUMNNAME_ColumnName) .list(); From 060b3a551c3893123a68fdc15e07bf3cc8ecdec5 Mon Sep 17 00:00:00 2001 From: Yamel Senih Date: Tue, 8 Feb 2022 15:43:24 -0400 Subject: [PATCH 09/13] Remove transaction get for parameters list --- base/src/org/compiere/model/MProcess.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/src/org/compiere/model/MProcess.java b/base/src/org/compiere/model/MProcess.java index 31e47a7b42d..6bac24901cc 100644 --- a/base/src/org/compiere/model/MProcess.java +++ b/base/src/org/compiere/model/MProcess.java @@ -264,7 +264,7 @@ public List getParametersAsList(String optionalWhereClause) { && optionalWhereClause.trim().length() > 0) whereClause.append(" AND ").append(optionalWhereClause); // - List list = new Query(getCtx(), I_AD_Process_Para.Table_Name, whereClause.toString(), get_TrxName()) + List list = new Query(getCtx(), I_AD_Process_Para.Table_Name, whereClause.toString(), null) .setParameters(get_ID()) .setOnlyActiveRecords(true) .setOrderBy(MProcessPara.COLUMNNAME_SeqNo) From 31bc38303207efac9e85ac0f30c07b45b6dfbc01 Mon Sep 17 00:00:00 2001 From: Yamel Senih Date: Tue, 8 Feb 2022 16:13:21 -0400 Subject: [PATCH 10/13] Remove transaction from MRole --- base/src/org/compiere/model/MRole.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/src/org/compiere/model/MRole.java b/base/src/org/compiere/model/MRole.java index db10e0c5c9f..57c88a44256 100644 --- a/base/src/org/compiere/model/MRole.java +++ b/base/src/org/compiere/model/MRole.java @@ -844,7 +844,7 @@ private void loadTableInfo (boolean reload) + "FROM AD_Table WHERE IsActive='Y'"; try { - pstmt = DB.prepareStatement(sql, get_TrxName()); + pstmt = DB.prepareStatement(sql, null); rs = pstmt.executeQuery(); while (rs.next()) { From 02c6000bfb7280f015077e912f34d38e5974e8fe Mon Sep 17 00:00:00 2001 From: Yamel Senih Date: Tue, 8 Feb 2022 16:51:36 -0400 Subject: [PATCH 11/13] Remove transaction from load record access --- base/src/org/compiere/model/MRole.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/src/org/compiere/model/MRole.java b/base/src/org/compiere/model/MRole.java index 57c88a44256..670e708e23b 100644 --- a/base/src/org/compiere/model/MRole.java +++ b/base/src/org/compiere/model/MRole.java @@ -925,7 +925,7 @@ private void loadRecordAccess(boolean reload) { whereClause = "(AD_Role_ID=? OR AD_User_ID = " + m_AD_User_ID + ")"; } // Add standard access - new Query(getCtx(), I_AD_Record_Access.Table_Name, whereClause, get_TrxName()) + new Query(getCtx(), I_AD_Record_Access.Table_Name, whereClause, null) .setParameters(getAD_Role_ID()) .setOnlyActiveRecords(true) .setOrderBy(I_AD_Record_Access.COLUMNNAME_AD_Table_ID) From ad164410dca370f37e257b1ed94911b1739892e3 Mon Sep 17 00:00:00 2001 From: Yamel Senih Date: Tue, 8 Feb 2022 20:03:25 -0400 Subject: [PATCH 12/13] Remove transaction --- base/src/org/compiere/model/MRole.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/src/org/compiere/model/MRole.java b/base/src/org/compiere/model/MRole.java index 670e708e23b..c4084457a4f 100644 --- a/base/src/org/compiere/model/MRole.java +++ b/base/src/org/compiere/model/MRole.java @@ -1498,7 +1498,7 @@ public Boolean getWindowAccess (int AD_Window_ID) ResultSet rs = null; try { - pstmt = DB.prepareStatement(sql, get_TrxName()); + pstmt = DB.prepareStatement(sql, null); pstmt.setInt(1, getAD_Role_ID()); rs = pstmt.executeQuery(); while (rs.next()) From e0a8e2b7bec4d898d31fe204b64a0041b86ac802 Mon Sep 17 00:00:00 2001 From: Yamel Senih Date: Tue, 8 Feb 2022 21:39:34 -0400 Subject: [PATCH 13/13] Remove transaction for role cached --- base/src/org/compiere/model/MRole.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/src/org/compiere/model/MRole.java b/base/src/org/compiere/model/MRole.java index c4084457a4f..c34e61629b3 100644 --- a/base/src/org/compiere/model/MRole.java +++ b/base/src/org/compiere/model/MRole.java @@ -2926,7 +2926,7 @@ private void loadChildRoles(boolean reload) } // final String whereClause = X_AD_Role_Included.COLUMNNAME_AD_Role_ID+"=?"; - List list = new Query(getCtx(), X_AD_Role_Included.Table_Name, whereClause, get_TrxName()) + List list = new Query(getCtx(), X_AD_Role_Included.Table_Name, whereClause, null) .setParameters(new Object[]{getAD_Role_ID()}) .setOnlyActiveRecords(true) .setOrderBy( @@ -2967,7 +2967,7 @@ private void loadSubstitutedRoles(boolean reload) +" AND (us.ValidFrom IS NULL OR us.ValidFrom <= getdate())" +" AND (us.ValidTo IS NULL OR us.ValidTo >= getdate())" +" AND us.Substitute_ID=?)"; - List list = new Query(getCtx(), Table_Name, whereClause, get_TrxName()) + List list = new Query(getCtx(), Table_Name, whereClause, null) .setParameters(new Object[]{AD_User_ID}) .setClient_ID() .setOrderBy(COLUMNNAME_AD_Role_ID)