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

IDEMPIERE-455 Discover and fix FindBugs problems / Pattern NS_DANGEROUS_NON_SHORT_CIRCUIT

This commit is contained in:
Richard Morales 2012-12-10 14:35:53 -05:00
parent 05b0af19e5
commit ad61a5e637
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
org.adempiere.base.process/src/org/compiere/process/DistributionRun.java
View File

@ -114,13 +114,13 @@ public class DistributionRun extends SvrProcess
} }
else if (name.equals("IsTest")) else if (name.equals("IsTest"))
p_IsTest = "Y".equals(para[i].getParameter()); p_IsTest = "Y".equals(para[i].getParameter());
else if (m_docType.getDocBaseType().equals(MDocType.DOCBASETYPE_DistributionOrder) & name.equals("M_Warehouse_ID")) else if (m_docType.getDocBaseType().equals(MDocType.DOCBASETYPE_DistributionOrder) && name.equals("M_Warehouse_ID"))
p_M_Warehouse_ID=((BigDecimal)para[i].getParameter()).intValue(); p_M_Warehouse_ID=((BigDecimal)para[i].getParameter()).intValue();
else if (m_docType.getDocBaseType().equals(MDocType.DOCBASETYPE_DistributionOrder) & name.equals("ConsolidateDocument")) else if (m_docType.getDocBaseType().equals(MDocType.DOCBASETYPE_DistributionOrder) && name.equals("ConsolidateDocument"))
p_ConsolidateDocument="Y".equals((String)para[i].getParameter()); p_ConsolidateDocument="Y".equals((String)para[i].getParameter());
else if (m_docType.getDocBaseType().equals(MDocType.DOCBASETYPE_DistributionOrder) & name.equals("M_DistributionList_ID")) else if (m_docType.getDocBaseType().equals(MDocType.DOCBASETYPE_DistributionOrder) && name.equals("M_DistributionList_ID"))
p_M_DistributionList_ID=para[i].getParameterAsInt(); p_M_DistributionList_ID=para[i].getParameterAsInt();
else if (m_docType.getDocBaseType().equals(MDocType.DOCBASETYPE_DistributionOrder) & name.equals("IsRequiredDRP")) else if (m_docType.getDocBaseType().equals(MDocType.DOCBASETYPE_DistributionOrder) && name.equals("IsRequiredDRP"))
p_BasedInDamnd = "Y".equals((String)para[i].getParameter()); p_BasedInDamnd = "Y".equals((String)para[i].getParameter());
else else
log.log(Level.SEVERE, "prepare - Unknown Parameter: " + name); log.log(Level.SEVERE, "prepare - Unknown Parameter: " + name);
@ -160,7 +160,7 @@ public class DistributionRun extends SvrProcess
if (p_DatePromised == null) if (p_DatePromised == null)
p_DatePromised = m_DateOrdered; p_DatePromised = m_DateOrdered;
if(m_docType.getDocBaseType().equals(MDocType.DOCBASETYPE_DistributionOrder) & p_M_Warehouse_ID > 0) if(m_docType.getDocBaseType().equals(MDocType.DOCBASETYPE_DistributionOrder) && p_M_Warehouse_ID > 0)
{ {
if(p_BasedInDamnd) if(p_BasedInDamnd)
{ {

2
org.adempiere.base/src/org/eevolution/process/ExportFormatGenerator.java
View File

@ -95,7 +95,7 @@ public class ExportFormatGenerator extends SvrProcess
String format = null; String format = null;
if(tab.isActive()) if(tab.isActive())
{ {
if(p_IsInsertRecord&tab.isInsertRecord()) if(p_IsInsertRecord && tab.isInsertRecord())
{ {
table = new MTable(getCtx(), tab.getAD_Table_ID(), get_TrxName()); table = new MTable(getCtx(), tab.getAD_Table_ID(), get_TrxName());
format = createFormat(table); format = createFormat(table);