From 944542b61b205a6020701c203d9870662afe4064 Mon Sep 17 00:00:00 2001 From: hieplq Date: Fri, 3 Jul 2015 21:01:34 +0700 Subject: [PATCH] IDEMPIERE-2640:Performance: Html/Tabular reports size could be reduced fix: NPE report by Tomas Svikruha --- .../src/org/compiere/print/ReportEngine.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/print/ReportEngine.java b/org.adempiere.base/src/org/compiere/print/ReportEngine.java index 53104d2fc7..45a8b907d3 100644 --- a/org.adempiere.base/src/org/compiere/print/ReportEngine.java +++ b/org.adempiere.base/src/org/compiere/print/ReportEngine.java @@ -1915,13 +1915,24 @@ queued-job-count = 0 (class javax.print.attribute.standard.QueuedJobCount) CSSInfo compareObj = (CSSInfo)obj; - if (compareObj.color == null && color != null) + return compareObj (compareObj.color, color) && compareObj (compareObj.font, font); + } + + /** + * compare two object equal when both is null or result of equal + * @param obj1 + * @param obj2 + * @return + */ + protected boolean compareObj(Object obj1, Object obj2) { + if (obj1 == null && obj2 != null) return false; - if (compareObj.font == null && font != null) - return false; + if (obj1 == null && obj2 == null){ + return true; + } - return compareObj.color.equals(color) && compareObj.font.equals(font); + return obj1.equals(obj2); } /**