make sure initial BC security provider registration works!

... when **-Djruby.openssl.provider.register=true**

Author: kares

src/main/java/org/jruby/ext/openssl/OpenSSL.java

@@ -56,8 +56,7 @@ public static boolean isProviderAvailable() {
     }
 
     public static void createOpenSSL(final Ruby runtime) {
-        boolean registerProvider = SafePropertyAccessor.getBoolean("jruby.openssl.provider.register");
-        SecurityHelper.setRegisterProvider( registerProvider );
+        SecurityHelper.setRegisterProvider( SafePropertyAccessor.getBoolean("jruby.openssl.provider.register") );
 
         final RubyModule _OpenSSL = runtime.getOrCreateModule("OpenSSL");
         RubyClass _StandardError = runtime.getClass("StandardError");

src/main/java/org/jruby/ext/openssl/SecurityHelper.java

@@ -99,8 +99,8 @@ public abstract class SecurityHelper {
     private static String BC_PROVIDER_CLASS = "org.bouncycastle.jce.provider.BouncyCastleProvider";
     static boolean setBouncyCastleProvider = true; // (package access for tests)
     static Provider securityProvider; // 'BC' provider (package access for tests)
-    private static Boolean registerProvider = null;
-    private static final Map<String, Class> implEngines = new ConcurrentHashMap<String, Class>(16, 0.75f, 1);
+    private static volatile Boolean registerProvider = null;
+    static final Map<String, Class> implEngines = new ConcurrentHashMap<String, Class>(16, 0.75f, 1);
 
     /**
      * inject under a given name a cipher. also ensures that the registered
@@ -152,8 +152,10 @@ private static Provider newBouncyCastleProvider() {
         return null;
     }
 
-    public static synchronized void setRegisterProvider(boolean register) {
-        registerProvider = Boolean.valueOf(register); doRegisterProvider();
+    public static synchronized void setRegisterProvider(final boolean register) {
+        registerProvider = Boolean.valueOf(register);
+        if ( register ) getSecurityProvider(); // so that securityProvider != null
+        // getSecurityProvider does doRegisterProvider();
     }
 
     static boolean isProviderAvailable(final String name) {
@@ -168,13 +170,14 @@ static boolean isProviderRegistered() {
     private static void doRegisterProvider() {
         if ( registerProvider != null ) {
             synchronized(SecurityHelper.class) {
-                if ( registerProvider != null && registerProvider.booleanValue() ) {
+                final Boolean register = registerProvider;
+                if ( register != null && register.booleanValue() ) {
                     if ( securityProvider != null ) {
                         Security.addProvider(securityProvider);
+                        registerProvider = null;
                     }
                 }
             }
-            registerProvider = null;
         }
     }