GEODE-1792: Revert: Changed protocols and ciphers to be comma separated Make ssl-ciphers and ssl-protocols comma separated properties. The legacy *-ssl-ciphers and *-ssl-protocols still use space separated.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/86df8023 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/86df8023 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/86df8023 Branch: refs/heads/develop Commit: 86df802349e240d3a42d316722d1a170bdbbf97c Parents: 6ffa652 Author: Udo Kohlmeyer <[email protected]> Authored: Fri Aug 19 06:33:13 2016 +1000 Committer: Udo Kohlmeyer <[email protected]> Committed: Fri Aug 19 06:33:13 2016 +1000 ---------------------------------------------------------------------- .../gemfire/distributed/internal/tcpserver/TcpServer.java | 7 ------- .../com/gemstone/gemfire/distributed/LocatorDUnitTest.java | 3 +++ .../distributed/internal/DistributionConfigJUnitTest.java | 2 +- .../com/gemstone/gemfire/codeAnalysis/excludedClasses.txt | 1 + 4 files changed, 5 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/86df8023/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java index 6508f1b..36d05f0 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java @@ -205,13 +205,6 @@ public class TcpServer { } private void startServerThread() throws IOException { - //TODO Udo: clean this up - if(srv_sock != null){ - throw new RuntimeException("TcpServer.startServerThread + SrvSocket not null"); - } - if(srv_sock != null && !srv_sock.isClosed()){ - throw new RuntimeException("TcpServer.startServerThread + SrvSocket not closed"); - } if (srv_sock == null || srv_sock.isClosed()) { if (bind_address == null) { srv_sock = socketCreator.createServerSocket(port, BACKLOG); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/86df8023/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java index 8bfce23..7d95e4a 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java @@ -498,6 +498,8 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase { @Category(FlakyTest.class) public void testStartTwoLocatorsOneWithNonSSLAndTheOtherSSL() throws Exception { IgnoredException expectedException = IgnoredException.addIgnoredException("Remote host closed connection during handshake"); + + IgnoredException expectedException2 = IgnoredException.addIgnoredException("Unrecognized SSL message, plaintext connection"); disconnectAllFromDS(); Host host = Host.getHost(0); VM loc1 = host.getVM(1); @@ -543,6 +545,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase { } finally { loc1.invoke("stop locator", () -> stopLocator()); expectedException.remove(); + expectedException2.remove(); } } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/86df8023/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java index 56b35ea..a843457 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java @@ -111,7 +111,7 @@ public class DistributionConfigJUnitTest { System.out.println("otherList: " + otherList); //TODO - This makes no sense. One has no idea what the correct expected number of attributes are. - assertEquals(28, boolList.size()); + assertEquals(29, boolList.size()); assertEquals(33, intList.size()); assertEquals(84, stringList.size()); assertEquals(5, fileList.size()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/86df8023/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/excludedClasses.txt ---------------------------------------------------------------------- diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/excludedClasses.txt b/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/excludedClasses.txt index ac707b6..87f9374 100644 --- a/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/excludedClasses.txt +++ b/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/excludedClasses.txt @@ -151,3 +151,4 @@ com/gemstone/gemfire/internal/cache/operations/ContainsKeyOperationContext org/apache/geode/security/ResourcePermission org/apache/geode/security/ResourcePermission$Operation org/apache/geode/security/ResourcePermission$Resource +com/gemstone/gemfire/distributed/internal/tcpserver/LocatorCancelException
