提交 fd7ad571 authored 作者: noelgrandin's avatar noelgrandin

fix some calls to equals that were passing the wrong type (found by FindBugs)

上级 bd4e2665
...@@ -76,7 +76,7 @@ public class TestDateStorage extends TestBase { ...@@ -76,7 +76,7 @@ public class TestDateStorage extends TestBase {
printTime("inserted"); printTime("inserted");
for (TimeZone target : distinct) { for (TimeZone target : distinct) {
println("select from " + target.getID()); println("select from " + target.getID());
if ("Pacific/Kiritimati".equals(target)) { if ("Pacific/Kiritimati".equals(target.getID())) {
// there is a problem with this time zone, but it seems // there is a problem with this time zone, but it seems
// unrelated to this database (possibly wrong timezone // unrelated to this database (possibly wrong timezone
// information?) // information?)
......
...@@ -417,7 +417,7 @@ public class TestDate extends TestBase { ...@@ -417,7 +417,7 @@ public class TestDate extends TestBase {
d.writeValue(ValueNull.INSTANCE); d.writeValue(ValueNull.INSTANCE);
d.reset(); d.reset();
for (TimeZone target : distinct) { for (TimeZone target : distinct) {
if ("Pacific/Kiritimati".equals(target)) { if ("Pacific/Kiritimati".equals(target.getID())) {
// there is a problem with this time zone, but it seems // there is a problem with this time zone, but it seems
// unrelated to this database (possibly wrong timezone // unrelated to this database (possibly wrong timezone
// information?) // information?)
......
...@@ -104,7 +104,7 @@ public class ChangeCursor<K, V> implements Iterator<K> { ...@@ -104,7 +104,7 @@ public class ChangeCursor<K, V> implements Iterator<K> {
break; break;
} }
pos2 = pos2.parent; pos2 = pos2.parent;
if (pos2 == null || !pos1.page.equals(pos2.page.getPos())) { if (pos2 == null || !pos1.page.equals(pos2.page)) {
if (pos1.index + 1 < map.getChildPageCount(pos1.page)) { if (pos1.index + 1 < map.getChildPageCount(pos1.page)) {
pos1 = new CursorPos(pos1.page.getChildPage(++pos1.index), 0, pos1); pos1 = new CursorPos(pos1.page.getChildPage(++pos1.index), 0, pos1);
pos1 = min(pos1); pos1 = min(pos1);
...@@ -147,7 +147,7 @@ public class ChangeCursor<K, V> implements Iterator<K> { ...@@ -147,7 +147,7 @@ public class ChangeCursor<K, V> implements Iterator<K> {
break; break;
} }
pos1 = pos1.parent; pos1 = pos1.parent;
if (pos1 == null || !pos2.page.equals(pos1.page.getPos())) { if (pos1 == null || !pos2.page.equals(pos1.page)) {
if (pos2.index + 1 < map.getChildPageCount(pos2.page)) { if (pos2.index + 1 < map.getChildPageCount(pos2.page)) {
pos2 = new CursorPos(pos2.page.getChildPage(++pos2.index), 0, pos2); pos2 = new CursorPos(pos2.page.getChildPage(++pos2.index), 0, pos2);
pos2 = min(pos2); pos2 = min(pos2);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论