Apache/activemq
1
0
Fork 0
mirror of https://github.com/apache/activemq.git synced 2025-03-08 09:10:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

AMQ-5917 - fix sync on SslContext lazy initialisation

Browse Source
This commit is contained in:
gtully 2018-08-20 12:23:53 +01:00
parent 50d27e7e54
commit 8bb3a77270
2 changed files with 83 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
activemq-client/src/main/java/org/apache/activemq/broker/SslContext.java
View File

@ -38,6 +38,7 @@ public class SslContext {
protected List<KeyManager> keyManagers = new ArrayList<KeyManager>();
protected List<TrustManager> trustManagers = new ArrayList<TrustManager>();
protected SecureRandom secureRandom;
private volatile boolean initialized;
private SSLContext sslContext;
private static final ThreadLocal<SslContext> current = new ThreadLocal<SslContext>();
@ -117,18 +118,24 @@ public class SslContext {
}
public SSLContext getSSLContext() throws NoSuchProviderException, NoSuchAlgorithmException, KeyManagementException {
if( sslContext == null ) {
if( provider == null ) {
sslContext = SSLContext.getInstance(protocol);
} else {
sslContext = SSLContext.getInstance(protocol, provider);
if (!initialized) {
synchronized (this) {
if (!initialized) {
if (provider == null) {
sslContext = SSLContext.getInstance(protocol);
} else {
sslContext = SSLContext.getInstance(protocol, provider);
}
sslContext.init(getKeyManagersAsArray(), getTrustManagersAsArray(), getSecureRandom());
initialized = true;
}
}
sslContext.init(getKeyManagersAsArray(), getTrustManagersAsArray(), getSecureRandom());
}
return sslContext;
}
public void setSSLContext(SSLContext sslContext) {
public synchronized void setSSLContext(SSLContext sslContext) {
this.sslContext = sslContext;
initialized = true;
}

69
activemq-client/src/test/java/org/apache/activemq/broker/scheduler/SslContextTest.java Normal file
View File

@ -0,0 +1,69 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.broker.scheduler;
import org.apache.activemq.broker.SslContext;
import org.junit.Test;
import javax.net.ssl.SSLContext;
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
public class SslContextTest {
SslContext underTest = new SslContext();
@Test
public void testConcurrentGet() throws Exception {
final int numReps = 100;
ExecutorService executorService = Executors.newFixedThreadPool(numReps);
final SSLContext[] results = new SSLContext[numReps];
for (int i=0; i<numReps; i++) {
final int instanceIndex = i;
executorService.execute(new Runnable() {
@Override
public void run() {
try {
results[instanceIndex] = underTest.getSSLContext();
} catch (NoSuchProviderException e) {
e.printStackTrace();
} catch (NoSuchAlgorithmException e) {
e.printStackTrace();
} catch (KeyManagementException e) {
e.printStackTrace();
}
}
});
}
executorService.shutdown();
assertTrue(executorService.awaitTermination(10, TimeUnit.SECONDS));
for (int i=0; i<numReps; i++) {
assertEquals("single instance", results[0], results[i]);
}
}
}