0005312: ReportGuaranteeDateJR, Invalid if statement causes Null pointer access

Index: src/org/openbravo/erpCommon/ad_reports/ReportGuaranteeDateJR.java
===================================================================
--- src/org/openbravo/erpCommon/ad_reports/ReportGuaranteeDateJR.java	(revision 8014)
+++ src/org/openbravo/erpCommon/ad_reports/ReportGuaranteeDateJR.java	(working copy)
@@ -63,7 +63,7 @@
 	String discard[] = {"discard"};
       data = ReportGuaranteeDateData.select(this, Utility.getContext(this, vars, "#User_Client", "ReportGuaranteeDateJR"), Utility.getContext(this, vars, "#User_Org", "ReportGuaranteeDateJR"), DateTimeData.nDaysAfter(this, strDate,"1"), strcBpartnerId, strmWarehouseId);
 
-  if (data == null && data.length == 0){
+  if (data == null || data.length == 0){
         discard[0] = "selEliminar";
         data = ReportGuaranteeDateData.set();
       }

Index: src/org/openbravo/erpCommon/ad_reports/ReportGuaranteeDateJR.java
===================================================================
--- src/org/openbravo/erpCommon/ad_reports/ReportGuaranteeDateJR.java	(revision 8044)
+++ src/org/openbravo/erpCommon/ad_reports/ReportGuaranteeDateJR.java	(revision 8045)
@@ -63,7 +63,7 @@
 	String discard[] = {"discard"};
       data = ReportGuaranteeDateData.select(this, Utility.getContext(this, vars, "#User_Client", "ReportGuaranteeDateJR"), Utility.getContext(this, vars, "#User_Org", "ReportGuaranteeDateJR"), DateTimeData.nDaysAfter(this, strDate,"1"), strcBpartnerId, strmWarehouseId);
 
-  if (data == null && data.length == 0){
+  if (data == null || data.length == 0){
         discard[0] = "selEliminar";
         data = ReportGuaranteeDateData.set();
       }
Index: src/org/openbravo/erpCommon/ad_reports/ReportProjectBuildingSiteJR.java
===================================================================
--- src/org/openbravo/erpCommon/ad_reports/ReportProjectBuildingSiteJR.java	(revision 8044)
+++ src/org/openbravo/erpCommon/ad_reports/ReportProjectBuildingSiteJR.java	(revision 8045)
@@ -232,7 +232,7 @@
 	
       data = ReportProjectBuildingSiteData.select(this, Utility.getContext(this, vars, "#User_Client", "ReportProjectBuildingSiteJR"), Utility.getContext(this, vars, "#User_Org", "ReportProjectBuildingSiteJR"), strdateFrom, DateTimeData.nDaysAfter(this, strdateTo,"1"), strcBpartnerId, strcProjectId, strmCategoryId, strProjectkind, strProjectphase, strProjectstatus, strProjectpublic, strcRegionId, strSalesRep, strProduct);
 
-  if (data == null && data.length == 0){
+  if (data == null || data.length == 0){
         discard[0] = "selEliminar";
         data = ReportProjectBuildingSiteData.set();
       }
Index: src/org/openbravo/erpCommon/ad_reports/ReportToInvoiceConsignmentJR.java
===================================================================
--- src/org/openbravo/erpCommon/ad_reports/ReportToInvoiceConsignmentJR.java	(revision 8044)
+++ src/org/openbravo/erpCommon/ad_reports/ReportToInvoiceConsignmentJR.java	(revision 8045)
@@ -115,7 +115,7 @@
 
     ReportToInvoiceConsignmentData[] data = ReportToInvoiceConsignmentData.select(this, Utility.getContext(this, vars, "#User_Client", "ReportToInvoiceConsignmentJR"), Utility.getContext(this, vars, "#User_Org", "ReportToInvoiceConsignmentJR"), strDateFrom, DateTimeData.nDaysAfter(this, strDateTo,"1"), strWarehouse);  
 
-	 if (data == null && data.length == 0){
+	 if (data == null || data.length == 0){
            data = ReportToInvoiceConsignmentData.set();
       }
       String strReportName = "@basedesign@/org/openbravo/erpCommon/ad_reports/ReportToInvoiceConsignmentJR.jrxml";