geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject incubator-geode git commit: GEODE-420: Bug fixes from precheckin
Date Thu, 25 Aug 2016 00:32:31 GMT
Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-420 7addcd953 -> 5fd94d59d


GEODE-420: Bug fixes from precheckin


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/5fd94d59
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/5fd94d59
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/5fd94d59

Branch: refs/heads/feature/GEODE-420
Commit: 5fd94d59d61d404914c1977dc8dcb8f794161555
Parents: 7addcd9
Author: Udo Kohlmeyer <ukohlmeyer@pivotal.io>
Authored: Thu Aug 25 10:32:23 2016 +1000
Committer: Udo Kohlmeyer <ukohlmeyer@pivotal.io>
Committed: Thu Aug 25 10:32:23 2016 +1000

----------------------------------------------------------------------
 .../gemstone/gemfire/internal/net/SocketCreatorFactory.java  | 3 ++-
 .../cache/client/internal/LocatorLoadBalancingDUnitTest.java | 4 ++++
 .../com/gemstone/gemfire/management/JMXMBeanDUnitTest.java   | 8 +++-----
 3 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5fd94d59/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SocketCreatorFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SocketCreatorFactory.java
b/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SocketCreatorFactory.java
index 96e8d77..6e39381 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SocketCreatorFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SocketCreatorFactory.java
@@ -74,7 +74,8 @@ public class SocketCreatorFactory {
     if (sslConfig.isEnabled()) {
       if (ArrayUtils.contains(getDistributionConfig().getSSLEnabledComponents(), SecurableComponent.ALL))
{
         return createSSLSocketCreator(SecurableComponent.ALL, sslConfig);
-      } else if (ArrayUtils.contains(getDistributionConfig().getSSLEnabledComponents(), sslComponent))
{
+//      } else if (ArrayUtils.contains(getDistributionConfig().getSSLEnabledComponents(),
sslComponent)) {
+      } else {
         return createSSLSocketCreator(sslComponent, sslConfig);
       }
     }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5fd94d59/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorLoadBalancingDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorLoadBalancingDUnitTest.java
b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorLoadBalancingDUnitTest.java
index 4173886..670fd9d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorLoadBalancingDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorLoadBalancingDUnitTest.java
@@ -21,6 +21,8 @@ import org.junit.Test;
 
 import static org.junit.Assert.*;
 
+import com.gemstone.gemfire.distributed.internal.DistributionConfigImpl;
+import com.gemstone.gemfire.internal.net.SocketCreatorFactory;
 import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
 import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
 import com.gemstone.gemfire.test.junit.categories.DistributedTest;
@@ -59,6 +61,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -141,6 +144,7 @@ public class LocatorLoadBalancingDUnitTest extends LocatorTestBase {
     Map expected = new HashMap();
     expected.put(expectedLocation, expectedLoad);
 
+    SocketCreatorFactory.setDistributionConfig(new DistributionConfigImpl(new Properties()));
     ClientConnectionResponse response;
     response = (ClientConnectionResponse) new TcpClient().requestToServer(InetAddress
             .getByName(NetworkUtils.getServerHostName(host)), locatorPort,

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5fd94d59/geode-core/src/test/java/com/gemstone/gemfire/management/JMXMBeanDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/JMXMBeanDUnitTest.java
b/geode-core/src/test/java/com/gemstone/gemfire/management/JMXMBeanDUnitTest.java
index f92136e..022bfee 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/JMXMBeanDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/JMXMBeanDUnitTest.java
@@ -37,6 +37,7 @@ import javax.management.remote.JMXServiceURL;
 import javax.rmi.ssl.SslRMIClientSocketFactory;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -132,10 +133,10 @@ public class JMXMBeanDUnitTest extends DistributedTestCase {
   //  To be fixed in GEODE-1716
   public void testJMXOverLegacySSL() throws Exception {
     Properties properties = configureLocatorProperties(new Properties(), jmxPort, serverHostName,
true, true, false);
-    locator.invoke("Configure and start Locator", () -> {
+//    locator.invoke("Configure and start Locator", () -> {
       System.setProperty("javax.ssl.debug", "true");
       configureAndStartLocator(locatorPort, jmxPort, serverHostName, properties);
-    });
+//    });
 
     jmxClient.invoke("Configure and start JMX Client", () -> {
       System.setProperty("javax.ssl.debug", "true");
@@ -176,9 +177,6 @@ public class JMXMBeanDUnitTest extends DistributedTestCase {
       System.setProperty("javax.net.ssl.trustStore", useMulti ? getMultiKeyTruststore() :
getSimpleSingleKeyKeystore());
       System.setProperty("javax.net.ssl.trustStoreType", "JKS");
       System.setProperty("javax.net.ssl.trustStorePassword", "password");
-      System.setProperty("com.sun.management.jmxremote.ssl.need.client.auth", "true");
-      System.setProperty("com.sun.management.jmxremote.ssl", "true");
-      System.setProperty("com.sun.management.jmxremote.registry.ssl", "true");
       environment.put("com.sun.jndi.rmi.factory.socket", new SslRMIClientSocketFactory());
     }
 


Mime
View raw message