opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.15'

Browse Source 
* stable-2.15:
  Add missing registration for VoteDeletedEvent
  Order alphabetically the registered events
  Revert from murmur3_128 to sha1 in LibraryDownloader

Change-Id: I7929f2e0d47ae508cbf205890eb87568d4f179c5
This commit is contained in:
Paladox
2017-10-16 14:53:11 +01:00
parent 1a7b08e5dc 656f82c14f
commit 32b1b7a14d
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/LibraryDownloader.java
View File

@@ -275,13 +275,14 @@ class LibraryDownloader {
}
}
@SuppressWarnings("deprecation") // Use Hashing.sha1 for compatibility.
private void verifyFileChecksum() {
if (sha1 == null) {
System.err.println();
System.err.flush();
return;
}
Hasher h = Hashing.murmur3_128().newHasher();
Hasher h = Hashing.sha1().newHasher();
try (InputStream in = Files.newInputStream(dst);
OutputStream out = Funnels.asOutputStream(h)) {
ByteStreams.copy(in, out);

7
gerrit-server/src/main/java/com/google/gerrit/server/events/EventTypes.java
View File

@@ -29,13 +29,14 @@ public class EventTypes {
register(CommentAddedEvent.TYPE, CommentAddedEvent.class);
register(CommitReceivedEvent.TYPE, CommitReceivedEvent.class);
register(HashtagsChangedEvent.TYPE, HashtagsChangedEvent.class);
register(RefUpdatedEvent.TYPE, RefUpdatedEvent.class);
register(PatchSetCreatedEvent.TYPE, PatchSetCreatedEvent.class);
register(ProjectCreatedEvent.TYPE, ProjectCreatedEvent.class);
register(RefReceivedEvent.TYPE, RefReceivedEvent.class);
register(RefUpdatedEvent.TYPE, RefUpdatedEvent.class);
register(ReviewerAddedEvent.TYPE, ReviewerAddedEvent.class);
register(ReviewerDeletedEvent.TYPE, ReviewerDeletedEvent.class);
register(PatchSetCreatedEvent.TYPE, PatchSetCreatedEvent.class);
register(TopicChangedEvent.TYPE, TopicChangedEvent.class);
register(ProjectCreatedEvent.TYPE, ProjectCreatedEvent.class);
register(VoteDeletedEvent.TYPE, VoteDeletedEvent.class);
}
/**