[teiid-commits] teiid SVN: r3730 - in branches/7.4.x/runtime/src: test/java/org/teiid/transport and 1 other directory.
Author: jolee
Date: 2011-12-12 14:32:04 -0500 (Mon, 12 Dec 2011)
New Revision: 3730
Modified:
branches/7.4.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java
branches/7.4.x/runtime/src/test/java/org/teiid/transport/TestCommSockets.java
Log:
SOA-3621 Support Patch for SOA-3620 EDS 5.2 enabledCipherSuites property gives error on
startup of server
Modified: branches/7.4.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java
===================================================================
---
branches/7.4.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java 2011-12-09
21:44:19 UTC (rev 3729)
+++
branches/7.4.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java 2011-12-12
19:32:04 UTC (rev 3730)
@@ -151,7 +151,7 @@
this.enabledCipherSuites = enabledCipherSuites.split(","); //$NON-NLS-1$
}
- public String[] getEnabledCipherSuites() {
+ public String[] getEnabledCipherSuitesAsArray() {
return enabledCipherSuites;
}
}
Modified: branches/7.4.x/runtime/src/test/java/org/teiid/transport/TestCommSockets.java
===================================================================
---
branches/7.4.x/runtime/src/test/java/org/teiid/transport/TestCommSockets.java 2011-12-09
21:44:19 UTC (rev 3729)
+++
branches/7.4.x/runtime/src/test/java/org/teiid/transport/TestCommSockets.java 2011-12-12
19:32:04 UTC (rev 3730)
@@ -259,7 +259,7 @@
@Test public void testEnableCipherSuites() throws Exception {
SSLConfiguration config = new SSLConfiguration();
config.setEnabledCipherSuites("x,y,z");
- assertArrayEquals(new String[] {"x","y","z"},
config.getEnabledCipherSuites());
+ assertArrayEquals(new String[] {"x","y","z"},
config.getEnabledCipherSuitesAsArray());
}
}