diff options
| author | Hugo Arès <hugo.ares@ericsson.com> | 2016-09-12 10:16:31 -0400 |
|---|---|---|
| committer | Hugo Arès <hugo.ares@ericsson.com> | 2016-09-12 10:16:53 -0400 |
| commit | ad94315a78a3d4e3ddd1581d66d7cd59df112829 (patch) | |
| tree | 7dd0b5f9dac545f67e1170d7d7f137c0bf049197 | |
| parent | 1621f4e731833d0224a28c4307d4758c4a8332ca (diff) | |
| parent | 78808c5d3474ab909f0ecfec9c3dcee003d9d44f (diff) | |
Merge branch 'stable-2.12' into stable-2.13
* stable-2.12:
Fix the DiffPreference and EditPreference dialogs on diffs and edits
OutgoingEmailValidator: Revert back to using static initialization
Change-Id: I59af6cff20fba872435d26d120b2bf90ca551c9a
3 files changed, 7 insertions, 8 deletions
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PreferencesBox.ui.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PreferencesBox.ui.xml index 0a5e6a2061..78e113aa62 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PreferencesBox.ui.xml +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PreferencesBox.ui.xml @@ -32,7 +32,8 @@ limitations under the License. color: #ffffff; font-family: arial,sans-serif; font-weight: bold; - overflow: hidden; + overflow: auto !important; + bottom: 0; text-align: left; text-shadow: 1px 1px 7px #000000; min-width: 300px; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/editor/EditPreferencesBox.ui.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/client/editor/EditPreferencesBox.ui.xml index b5b0b016a8..5fa3f16f0c 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/editor/EditPreferencesBox.ui.xml +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/editor/EditPreferencesBox.ui.xml @@ -32,7 +32,8 @@ limitations under the License. color: #ffffff; font-family: arial,sans-serif; font-weight: bold; - overflow: hidden; + overflow: auto !important; + bottom: 0; text-align: left; text-shadow: 1px 1px 7px #000000; min-width: 300px; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmailValidator.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmailValidator.java index 956b69357c..5ab5f4e3db 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmailValidator.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmailValidator.java @@ -19,15 +19,12 @@ import static org.apache.commons.validator.routines.DomainValidator.ArrayType.GE 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); + static { + DomainValidator.updateTLDOverride(GENERIC_PLUS, new String[]{"local"}); + } public static boolean isValid(String addr) { - if (!initialized.getAndSet(true)) { - DomainValidator.updateTLDOverride(GENERIC_PLUS, new String[]{"local"}); - } return EmailValidator.getInstance(true, true).isValid(addr); } } |