svn commit: r1543385 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java

[kkolinko]

Author: kkolinko
Date: Tue Nov 19 11:17:55 2013
New Revision: 1543385

URL: http://svn.apache.org/r1543385
Log:
Merged r1543383 from tomcat/trunk:
Followup to r1456457
Correct typo in the name of a private field

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1543383

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=1543385&r1=1543384&r2=1543385&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
 Tue Nov 19 11:17:55 2013
@@ -90,7 +90,7 @@ public class JSSESocketFactory implement
     private static final boolean RFC_5746_SUPPORTED;
 
     private static final String[] DEFAULT_SERVER_PROTOCOLS;
-    private static final String[] DEAFULT_SERVER_CIPHER_SUITES;
+    private static final String[] DEFAULT_SERVER_CIPHER_SUITES;
 
     // Defaults - made public where re-used
     private static final String defaultProtocol = "TLS";
@@ -137,7 +137,7 @@ public class JSSESocketFactory implement
             // Unable to determine default ciphers/protocols so use none
         }
         RFC_5746_SUPPORTED = result;
-        DEAFULT_SERVER_CIPHER_SUITES = ciphers;
+        DEFAULT_SERVER_CIPHER_SUITES = ciphers;
         DEFAULT_SERVER_PROTOCOLS = protocols;
     }
 
@@ -231,7 +231,7 @@ public class JSSESocketFactory implement
         }
         if ((requestedCiphersStr == null)
                 || (requestedCiphersStr.trim().length() == 0)) {
-            return DEAFULT_SERVER_CIPHER_SUITES;
+            return DEFAULT_SERVER_CIPHER_SUITES;
         }
 
         List<String> requestedCiphers = new ArrayList<String>();
@@ -242,7 +242,7 @@ public class JSSESocketFactory implement
             }
         }
         if (requestedCiphers.isEmpty()) {
-            return DEAFULT_SERVER_CIPHER_SUITES;
+            return DEFAULT_SERVER_CIPHER_SUITES;
         }
         List<String> ciphers = new ArrayList<String>(requestedCiphers);
         ciphers.retainAll(Arrays.asList(context.getSupportedSSLParameters()



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org