From 2043556e6c9ebe4bfaaa887309a3637493b63caf Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 21 Jan 2016 14:30:37 +0000 Subject: coverity#1326551 Dereference before null check Change-Id: I11a65723909b7ed78a487ece7456c0e5a4d1aa8b --- reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'reportbuilder') diff --git a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java index 899e740d6373..26eb4950e248 100644 --- a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java +++ b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java @@ -94,7 +94,7 @@ public class SDBCReportDataFactory implements DataSourceFactory return false; } final RowSetProperties other = (RowSetProperties) obj; - if (this.escapeProcessing != other.escapeProcessing && (this.escapeProcessing == null || !this.escapeProcessing.equals(other.escapeProcessing))) + if ((this.escapeProcessing == null) ? (other.escapeProcessing != null) : !this.escapeProcessing.equals(other.escapeProcessing)) { return false; } @@ -102,7 +102,7 @@ public class SDBCReportDataFactory implements DataSourceFactory { return false; } - if (this.maxRows != other.maxRows && (this.maxRows == null || !this.maxRows.equals(other.maxRows))) + if ((this.maxRows == null) ? (other.maxRows != null) : !this.maxRows.equals(other.maxRows)) { return false; } -- cgit