commit 750a6c1e49306e16b91426f1885a05d6a67617b0
author Dave Borowitz <dborowitz@google.com> Mon May 30 09:32:17 2016 -0400
committer Dave Borowitz <dborowitz@google.com> Mon May 30 09:32:17 2016 -0400
tree 38824f62c4bedf912c012743ac90d2f1f6a12a2b
parent 8458cc2f4e1408ab134718a4be93397963bf836d

CommitValidators: Avoid IOBE when no Change-Id footer is present

Change-Id: Id766ddb3fe87a3a828a4a9d92ae1ebc26323cf51

gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java
index 74411ad..11f7a881 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java
@@ -245,13 +245,14 @@
         String errMsg = String.format(
             MULTIPLE_CHANGE_ID_MSG, sha1);
         throw new CommitValidationException(errMsg, messages);
-      }
-      String v = idList.get(idList.size() - 1).trim();
-      if (!CHANGE_ID.matcher(v).matches()) {
-        String errMsg = String.format(INVALID_CHANGE_ID_MSG, sha1);
-        messages.add(
-          getMissingChangeIdErrorMsg(errMsg, receiveEvent.commit));
-        throw new CommitValidationException(errMsg, messages);
+      } else {
+        String v = idList.get(idList.size() - 1).trim();
+        if (!CHANGE_ID.matcher(v).matches()) {
+          String errMsg = String.format(INVALID_CHANGE_ID_MSG, sha1);
+          messages.add(
+            getMissingChangeIdErrorMsg(errMsg, receiveEvent.commit));
+          throw new CommitValidationException(errMsg, messages);
+        }
       }
       return Collections.emptyList();
     }