1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8194073: Invalid SunNativeProvider.INSTANCE initialization

Browse Source 
Changed to always construct INSTANCE after MECH_MAP

Reviewed-by: valeriep
This commit is contained in:
Jan Kalina 2018-06-11 19:39:05 +00:00 committed by Valerie Peng
parent 8fe36bed48
commit 4e86e3720b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/java.security.jgss/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java
View File

@ -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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -53,8 +53,8 @@ public final class SunNativeProvider extends Provider {
"sun.security.jgss.wrapper.NativeGSSFactory"; "sun.security.jgss.wrapper.NativeGSSFactory";
private static final String LIB_PROP = "sun.security.jgss.lib"; private static final String LIB_PROP = "sun.security.jgss.lib";
private static final String DEBUG_PROP = "sun.security.nativegss.debug"; private static final String DEBUG_PROP = "sun.security.nativegss.debug";
private static HashMap<String, String> MECH_MAP; private static final HashMap<String, String> MECH_MAP;
static final Provider INSTANCE = new SunNativeProvider(); static final Provider INSTANCE;
static boolean DEBUG; static boolean DEBUG;
static void debug(String message) { static void debug(String message) {
if (DEBUG) { if (DEBUG) {
@ -117,6 +117,8 @@ public final class SunNativeProvider extends Provider {
return null; return null;
} }
}); });
// initialize INSTANCE after MECH_MAP is constructed
INSTANCE = new SunNativeProvider();
} }
public SunNativeProvider() { public SunNativeProvider() {