OpenJDK / portola / portola
changeset 50520:6aa873a6dae9
8194073: Invalid SunNativeProvider.INSTANCE initialization
Summary: Changed to always construct INSTANCE after MECH_MAP
Reviewed-by: valeriep
Contributed-by: Jan Kalina <jkalina@redhat.com>
| author | valeriep |
|---|---|
| date | Mon, 11 Jun 2018 19:39:05 +0000 |
| parents | e5cdf2569510 |
| children | 2b940ad6816f |
| files | src/java.security.jgss/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java |
| diffstat | 1 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java Mon Jun 11 20:18:38 2018 +0200 +++ b/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java Mon Jun 11 19:39:05 2018 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -53,8 +53,8 @@ "sun.security.jgss.wrapper.NativeGSSFactory"; private static final String LIB_PROP = "sun.security.jgss.lib"; private static final String DEBUG_PROP = "sun.security.nativegss.debug"; - private static HashMap<String, String> MECH_MAP; - static final Provider INSTANCE = new SunNativeProvider(); + private static final HashMap<String, String> MECH_MAP; + static final Provider INSTANCE; static boolean DEBUG; static void debug(String message) { if (DEBUG) { @@ -117,6 +117,8 @@ return null; } }); + // initialize INSTANCE after MECH_MAP is constructed + INSTANCE = new SunNativeProvider(); } public SunNativeProvider() {