From c47bc45be4cc9c6741ed6a08a68a53dbbcd5411c Mon Sep 17 00:00:00 2001
From: Edwin Kempin <ekempin@google.com>
Date: Tue, 23 Jan 2018 13:24:53 +0100
Subject: [PATCH] IdentifiedUser#getEmailAddresses: Return ImmutableSet

This prevents that callers acidentally make modifications to set of
emails that is kept by IdentifiedUser.

Change-Id: I19d7c6f0ce040b6815266776de3753a4bf9ace0c
Signed-off-by: Edwin Kempin <ekempin@google.com>
---
 java/com/google/gerrit/server/IdentifiedUser.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/com/google/gerrit/server/IdentifiedUser.java b/java/com/google/gerrit/server/IdentifiedUser.java
index b007fc0f26..6dfdfe1bd0 100644
--- a/java/com/google/gerrit/server/IdentifiedUser.java
+++ b/java/com/google/gerrit/server/IdentifiedUser.java
@@ -325,12 +325,12 @@ public class IdentifiedUser extends CurrentUser {
     return false;
   }
 
-  public Set<String> getEmailAddresses() {
+  public ImmutableSet<String> getEmailAddresses() {
     if (!loadedAllEmails) {
       validEmails.addAll(realm.getEmailAddresses(this));
       loadedAllEmails = true;
     }
-    return validEmails;
+    return ImmutableSet.copyOf(validEmails);
   }
 
   public String getName() {