summaryrefslogtreecommitdiff
path: root/reportbuilder
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-01-21 14:30:37 +0000
committerCaolán McNamara <caolanm@redhat.com>2016-01-21 15:15:52 +0000
commit2043556e6c9ebe4bfaaa887309a3637493b63caf (patch)
tree6a726a0fddfc3f6e9e528d359265e53c2223ab65 /reportbuilder
parent5f6e18f5475c8daa101aad22b9dea17c8b048389 (diff)
coverity#1326551 Dereference before null check
Change-Id: I11a65723909b7ed78a487ece7456c0e5a4d1aa8b
Diffstat (limited to 'reportbuilder')
-rw-r--r--reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java4
1 files changed, 2 insertions, 2 deletions
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;
}