stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8290887: Unused private method in TrustManagerFactoryImpl

Browse Source 
Reviewed-by: weijun, xuelei, mullan
This commit is contained in:
Mark Powers 2022-07-26 20:23:55 +00:00 committed by Sean Mullan
parent f0f78a9125
commit 4d796ee8ab
1 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/java.base/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1999, 2022, 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
@ -25,7 +25,6 @@
package sun.security.ssl; package sun.security.ssl;
import java.io.*;
import java.security.*; import java.security.*;
import java.security.cert.*; import java.security.cert.*;
import java.util.*; import java.util.*;
@ -62,7 +61,7 @@ abstract class TrustManagerFactoryImpl extends TrustManagerFactorySpi {
} catch (RuntimeException re) { } catch (RuntimeException re) {
if (SSLLogger.isOn && SSLLogger.isOn("trustmanager")) { if (SSLLogger.isOn && SSLLogger.isOn("trustmanager")) {
SSLLogger.fine( SSLLogger.fine(
"SunX509: skip default keystor", re); "SunX509: skip default keystore", re);
} }
throw re; throw re;
} catch (Exception e) { } catch (Exception e) {
@ -105,30 +104,6 @@ abstract class TrustManagerFactoryImpl extends TrustManagerFactorySpi {
return new TrustManager[] { trustManager }; return new TrustManager[] { trustManager };
} }
/*
* Try to get an InputStream based on the file we pass in.
*/
@SuppressWarnings("removal")
private static FileInputStream getFileInputStream(final File file)
throws Exception {
return AccessController.doPrivileged(
new PrivilegedExceptionAction<FileInputStream>() {
@Override
public FileInputStream run() throws Exception {
try {
if (file.exists()) {
return new FileInputStream(file);
} else {
return null;
}
} catch (FileNotFoundException e) {
// couldn't find it, oh well.
return null;
}
}
});
}
public static final class SimpleFactory extends TrustManagerFactoryImpl { public static final class SimpleFactory extends TrustManagerFactoryImpl {
@Override @Override
X509TrustManager getInstance( X509TrustManager getInstance(