// Copyright (C) 2016 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package com.google.gerrit.server.mail;

import static org.apache.commons.validator.routines.DomainValidator.ArrayType.GENERIC_PLUS;

import org.apache.commons.validator.routines.DomainValidator;
import org.apache.commons.validator.routines.EmailValidator;

import java.util.concurrent.atomic.AtomicBoolean;

public class OutgoingEmailValidator {
  private static final AtomicBoolean initialized = new AtomicBoolean(false);

  public static boolean isValid(String addr) {
    if (!initialized.getAndSet(true)) {
      DomainValidator.updateTLDOverride(GENERIC_PLUS, new String[]{"local"});
    }
    return EmailValidator.getInstance(true, true).isValid(addr);
  }
}

@@ -863,264 +863,57 @@
 r;%0A%0A
-import java.util.concurrent.atomic.AtomicBoolean;%0A%0Apublic class OutgoingEmailValidator %7B%0A  private static final AtomicBoolean initialized = new AtomicBoolean(false);%0A%0A  public static boolean isValid(String addr) %7B%0A    if (!initialized.getAndSet(true)) %7B%0A  
+public class OutgoingEmailValidator %7B%0A  static %7B%0A
     
@@ -986,19 +986,65 @@
 l%22%7D);%0A  
-  %7D
+%7D%0A%0A  public static boolean isValid(String addr) %7B
 %0A    ret

Revert back to using static initialization