src/share/classes/sun/security/ssl/CipherSuiteList.java

rev 11548 : 8133070: Hot lock on BulkCipher.isAvailable
Reviewed-by: mullan
Contributed-by: xuelei.fan@oracle.com, kungu.mjh@alibaba-inc.com

*** 1,7 ****
  /*
!  * Copyright (c) 2002, 2012, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 2002, 2015, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 72,100 ****
      CipherSuiteList(String[] names) {
          if (names == null) {
              throw new IllegalArgumentException("CipherSuites may not be null");
          }
          cipherSuites = new ArrayList<CipherSuite>(names.length);
-         // refresh available cache once if a CipherSuite is not available
-         // (maybe new JCE providers have been installed)
-         boolean refreshed = false;
          for (int i = 0; i < names.length; i++) {
              String suiteName = names[i];
              CipherSuite suite = CipherSuite.valueOf(suiteName);
              if (suite.isAvailable() == false) {
-                 if (refreshed == false) {
-                     // clear the cache so that the isAvailable() call below
-                     // does a full check
-                     clearAvailableCache();
-                     refreshed = true;
-                 }
-                 // still missing?
-                 if (suite.isAvailable() == false) {
                      throw new IllegalArgumentException("Cannot support "
                          + suiteName + " with currently installed providers");
                  }
-             }
              cipherSuites.add(suite);
          }
      }
  
      /**
--- 72,88 ----
*** 193,210 ****
              suiteBytes[i+1] = (byte)c.id;
              i += 2;
          }
          s.putBytes16(suiteBytes);
      }
- 
-     /**
-      * Clear cache of available ciphersuites. If we support all ciphers
-      * internally, there is no need to clear the cache and calling this
-      * method has no effect.
-      */
-     static synchronized void clearAvailableCache() {
-         if (CipherSuite.DYNAMIC_AVAILABILITY) {
-             CipherSuite.BulkCipher.clearAvailableCache();
-             JsseJce.clearEcAvailable();
-         }
-     }
  }
--- 181,186 ----