You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2011/12/06 08:09:30 UTC
svn commit: r1210802 - in /karaf/branches/karaf-2.2.x:
jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java
management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
Author: jbonofre
Date: Tue Dec 6 07:09:30 2011
New Revision: 1210802
URL: http://svn.apache.org/viewvc?rev=1210802&view=rev
Log:
[KARAF-541] Fix JMX SSL support
Modified:
karaf/branches/karaf-2.2.x/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java
karaf/branches/karaf-2.2.x/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
Modified: karaf/branches/karaf-2.2.x/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java?rev=1210802&r1=1210801&r2=1210802&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java (original)
+++ karaf/branches/karaf-2.2.x/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java Tue Dec 6 07:09:30 2011
@@ -128,19 +128,19 @@ public class OsgiKeystoreManager impleme
private void checkForKeystoresAvailability( String keyStore, String keyAlias, String trustStore, long timeout ) {
for (int i = 0 ; i < timeout/1000; ++i) {
KeystoreInstance keyInstance = getKeystore(keyStore);
- if (keyInstance != null && keyInstance.isKeystoreLocked()) {
+ if (keyInstance == null || (keyInstance != null && keyInstance.isKeystoreLocked())) {
sleep(1000);
logger.info( "Looking for keystore: {}...", keyStore );
continue;
}
- if (keyInstance != null && keyInstance.isKeyLocked(keyAlias)) {
+ if (keyInstance == null || (keyInstance != null && keyInstance.isKeyLocked(keyAlias))) {
sleep(1000);
logger.info( "Looking for keystore's key: {}...", keyAlias );
continue;
}
KeystoreInstance trustInstance = trustStore == null ? null : getKeystore(trustStore);
- if (trustInstance != null && trustInstance.isKeystoreLocked()) {
+ if (trustInstance == null || (trustInstance != null && trustInstance.isKeystoreLocked())) {
sleep(1000);
logger.info( "Looking for truststore: {}...", trustStore );
continue;
Modified: karaf/branches/karaf-2.2.x/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java?rev=1210802&r1=1210801&r2=1210802&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java (original)
+++ karaf/branches/karaf-2.2.x/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java Tue Dec 6 07:09:30 2011
@@ -210,7 +210,6 @@ public class ConnectorServerFactory {
}
if (this.secured) {
- Thread.sleep(500); // give jaas.keystores bundle time to init
this.setupSsl();
}