geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [24/47] incubator-geode git commit: GEODE-574: for --ciphers and --protocols options, if the value is "any", it should behave the same as if they were not specified (default value)
Date Fri, 08 Jan 2016 18:42:25 GMT
GEODE-574: for --ciphers and --protocols options, if the value is "any", it should behave the
same as if they were not specified (default value)

Closes #65


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

Branch: refs/heads/feature/GEODE-714
Commit: f36310d78df388a926895169de7ac16ebdb07493
Parents: 8b6d8f2
Author: Jinmei Liao <jiliao@pivotal.io>
Authored: Tue Dec 22 14:17:46 2015 -0800
Committer: Jens Deppe <jdeppe@pivotal.io>
Committed: Wed Jan 6 09:18:46 2016 -0800

----------------------------------------------------------------------
 .../internal/cli/shell/JmxOperationInvoker.java           | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f36310d7/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JmxOperationInvoker.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JmxOperationInvoker.java
b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JmxOperationInvoker.java
index e456bda..c2a1b2f 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JmxOperationInvoker.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JmxOperationInvoker.java
@@ -114,12 +114,14 @@ public class JmxOperationInvoker implements OperationInvoker {
       Set<Entry<String, String>> entrySet = sslConfigProps.entrySet();
       for (Iterator<Entry<String, String>> it = entrySet.iterator(); it.hasNext();)
{
         Entry<String, String> entry = it.next();
-        String key = entry.getKey();        
+        String key = entry.getKey();
+        String value = entry.getValue();
         if (key.startsWith("javax.") || key.startsWith("cluster-ssl") || key.startsWith("jmx-manager-ssl")
) {
           key =  checkforSystemPropertyPrefix(entry.getKey());
-          //TODO : If protocol is any lookup and set one of the following : Copied from SocketCreator

-          // String[] knownAlgorithms = {"SSL", "SSLv2", "SSLv3", "TLS", "TLSv1", "TLSv1.1"};
-          System.setProperty(key, entry.getValue());
+          if((key.equals(Gfsh.SSL_ENABLED_CIPHERS) || key.equals(Gfsh.SSL_ENABLED_PROTOCOLS))
&& "any".equals(value)){
+            continue;
+          }
+          System.setProperty(key, value);
           propsToClear.add(key);
         }
       }


Mime
View raw message