From d66ec1c0057173c56e79fd28bf738e3f14eccd6b Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Wed, 22 Jan 2014 16:10:28 +0900 Subject: [PATCH] Fix build failure due to Java 7 specific statement usage 6ecab77d02b2b117c0275ed391174aa63f683f60 was cherry-picked from master and causes a build failure because it uses a multi-catch statement that is not supported in source version 1.6. On master the Java source version is 1.7 which is why it builds there. Change-Id: Ia43c2c6b9068553635a5ddd5bc4129ddf5c1fd35 --- .../main/java/com/google/gerrit/server/project/GetHead.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetHead.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/GetHead.java index 589f75e65b..a73676b367 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetHead.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/GetHead.java @@ -63,11 +63,15 @@ public class GetHead implements RestReadView { return head.getObjectId().name(); } throw new AuthException(); - } catch (MissingObjectException | IncorrectObjectTypeException e) { + } catch (MissingObjectException e) { if (rsrc.getControl().isOwner()) { return head.getObjectId().name(); } throw new AuthException(); + } catch (IncorrectObjectTypeException e) { + if (rsrc.getControl().isOwner()) { + return head.getObjectId().name(); + } } finally { rw.release(); }