Author: rareddy Date: 2009-08-04 13:49:52 -0400 (Tue, 04 Aug 2009) New Revision: 1213 Modified: trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java Log: TEIID-665: correcting regression of previous code. Also, making the ssl enablement independent of crypto enablement. Modified: trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java 2009-08-04 16:37:03 UTC (rev 1212) +++ trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java 2009-08-04 17:49:52 UTC (rev 1213) @@ -80,11 +80,10 @@ boolean client_encryption_enabled = false; public void init(Properties props) { - ssl_enabled = PropertiesUtils.getBooleanProperty(props, SSL_ENABLED, false); + ssl_enabled = PropertiesUtils.getBooleanProperty(props, SSL_ENABLED, false); + client_encryption_enabled = PropertiesUtils.getBooleanProperty(props, CLIENT_ENCRYPTION_ENABLED, true); if (ssl_enabled) { - client_encryption_enabled = PropertiesUtils.getBooleanProperty(props, CLIENT_ENCRYPTION_ENABLED, true); - keyStoreFileName = props.getProperty(KEYSTORE_FILENAME); try { keyStorePassword = CryptoUtil.stringDecrypt(props.getProperty(KEYSTORE_PASSWORD, "")); //$NON-NLS-1$ @@ -142,11 +141,11 @@ } public boolean isServerSSLEnabled() { - return ssl_enabled && CryptoUtil.isEncryptionEnabled(); + return this.ssl_enabled; } public boolean isClientEncryptionEnabled() { - return CryptoUtil.isEncryptionEnabled() && client_encryption_enabled; + return this.client_encryption_enabled; } }