[teiid-commits] teiid SVN: r4408 - in branches/7.7.x/runtime/src: test/java/org/teiid/transport and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: jolee
Date: 2012-09-06 15:19:46 -0400 (Thu, 06 Sep 2012)
New Revision: 4408

Modified:
   branches/7.7.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java
   branches/7.7.x/runtime/src/test/java/org/teiid/transport/TestCommSockets.java
Log:
TEIID-2108:  backport fix for ssl mode setting

Modified: branches/7.7.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java
===================================================================
--- branches/7.7.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java	2012-09-06 19:15:48 UTC (rev 4407)
+++ branches/7.7.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java	2012-09-06 19:19:46 UTC (rev 4408)
@@ -41,7 +41,7 @@
     public static final String TWOWAY = "2-way"; //$NON-NLS-1$
     public static final String ANONYMOUS = "anonymous"; //$NON-NLS-1$
     
-    public static final String LOGIN = "logIn"; //$NON-NLS-1$
+    public static final String LOGIN = "login"; //$NON-NLS-1$
     public static final String DISABLED = "disabled"; //$NON-NLS-1$
     public static final String ENABLED = "enabled"; //$NON-NLS-1$
 
@@ -100,11 +100,11 @@
     }
 
     public boolean isClientEncryptionEnabled() {
-        return LOGIN.equals(mode);
+        return LOGIN.equalsIgnoreCase(mode);
     }
     
     public boolean isSslEnabled() {
-    	return ENABLED.equals(mode);
+    	return ENABLED.equalsIgnoreCase(mode);
     }
     
     public String getMode() {

Modified: branches/7.7.x/runtime/src/test/java/org/teiid/transport/TestCommSockets.java
===================================================================
--- branches/7.7.x/runtime/src/test/java/org/teiid/transport/TestCommSockets.java	2012-09-06 19:15:48 UTC (rev 4407)
+++ branches/7.7.x/runtime/src/test/java/org/teiid/transport/TestCommSockets.java	2012-09-06 19:19:46 UTC (rev 4408)
@@ -262,4 +262,13 @@
 		assertArrayEquals(new String[] {"x","y","z"}, config.getEnabledCipherSuitesAsArray());
 	}
 	
+	@Test public void testAnonSSLMode() throws Exception {
+		SSLConfiguration config = new SSLConfiguration();
+		config.setMode("enabled");
+		assertFalse(config.isClientEncryptionEnabled());
+		assertTrue(config.isSslEnabled());
+		config.setMode("login");
+		assertTrue(config.isClientEncryptionEnabled());
+	}
+	
 }