| commit | 01f526e667dd6c4fb420a6bc2c0690a7f6d98906 | [log] [tgz] |
|---|---|---|
| author | Viktoria Dlugopolskaya <viksnsk@gmail.com> | Wed Mar 01 11:11:05 2017 +0700 |
| committer | Viktoria Dlugopolskaya <viksnsk@gmail.com> | Wed Mar 01 11:44:12 2017 +0700 |
| tree | dc74585f4137586e98fd641156fb7c9c51c2aa53 | |
| parent | a9523f337513cb40df25e8acc06288609f966af5 [diff] |
Fixed NPE for AssertTablesMatchService Signed-off-by: Viktoria Dlugopolskaya <viksnsk@gmail.com>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.data/src/org/eclipse/rcptt/ecl/data/internal/commands/AssertTablesMatchService.java b/ecl/plugins/org.eclipse.rcptt.ecl.data/src/org/eclipse/rcptt/ecl/data/internal/commands/AssertTablesMatchService.java index 95bfa81..5edf61f 100644 --- a/ecl/plugins/org.eclipse.rcptt.ecl.data/src/org/eclipse/rcptt/ecl/data/internal/commands/AssertTablesMatchService.java +++ b/ecl/plugins/org.eclipse.rcptt.ecl.data/src/org/eclipse/rcptt/ecl/data/internal/commands/AssertTablesMatchService.java
@@ -112,7 +112,8 @@ Column rc = rightColumns.get(col); String lv = leftRow.getValues().get(lc.index); String rv = rightRow.getValues().get(rc.index); - if (!lv.equals(rv)) { + if (!(lv != null && rv != null && lv.equals(rv) + || lv == null && rv == null)) { return EclDataPlugin .createErr( "Tables differ at column '%s', %s: "