commit 795c384e4cc406e1a31e6644301f8d5e858ff656
author Han-Wen Nienhuys <hanwen@google.com> Thu Feb 16 14:53:39 2017 +0100
committer Han-Wen Nienhuys <hanwen@google.com> Thu Feb 16 14:55:11 2017 +0100
tree 32e43db180dd953de76a041e4a70fb79c05ece4a
parent 076d6e47049d32b01e3daeb69df660bc9d024814

Wrap IOExceptions in OrmException rather than IllegalStateException.

This avoids transient I/O problems from tripping up exception
monitoring.

Change-Id: I3563af3395bbe98a779be9a9ada6a4275d8216b7

gerrit-server/src/main/java/com/google/gerrit/server/query/change/ConflictsPredicate.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ConflictsPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ConflictsPredicate.java
index 9b11e8b..9b45890 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ConflictsPredicate.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ConflictsPredicate.java
@@ -131,7 +131,7 @@
                 args.conflictsCache.put(conflictsKey, conflicts);
                 return conflicts;
               } catch (IntegrationException | NoSuchProjectException | IOException e) {
-                throw new IllegalStateException(e);
+                throw new OrmException(e);
               }
             }
 

gerrit-server/src/main/java/com/google/gerrit/server/query/change/IsMergePredicate.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/IsMergePredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/IsMergePredicate.java
index 820c605..50e5bd9 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/IsMergePredicate.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/IsMergePredicate.java
@@ -39,7 +39,7 @@
       RevCommit commit = rw.parseCommit(id);
       return commit.getParentCount() > 1;
     } catch (IOException e) {
-      throw new IllegalStateException(e);
+      throw new OrmException(e);
     }
   }