Merge "Boolean fix."

gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_152.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_152.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_152.java
index 2ed7273..c5150a0 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_152.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_152.java
@@ -36,6 +36,8 @@
     SqlDialect dialect = schema.getDialect();
     try (StatementExecutor e = newExecutor(db)) {
       dialect.dropIndex(e, "accounts", "accounts_byFullName");
+    } catch (OrmException ex) {
+      // Ignore. The index did not exist.
     }
   }
 }

gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_157.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_157.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_157.java
index e232e7a..f5c5b59 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_157.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_157.java
@@ -36,6 +36,8 @@
     SqlDialect dialect = schema.getDialect();
     try (StatementExecutor e = newExecutor(db)) {
       dialect.dropIndex(e, "accounts", "accounts_byPreferredEmail");
+    } catch (OrmException ex) {
+      // Ignore. The index did not exist.
     }
   }
 }