Author: markt
Date: Mon Jan 14 08:44:06 2013
New Revision: 1432839
URL: http://svn.apache.org/viewvc?rev=1432839&view=rev
Log:
Whitespace police
Fix Java 7 <> related warnings
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtil.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
tomcat/trunk/webapps/docs/config/http.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtil.java?rev=1432839&r1=1432838&r2=1432839&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtil.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtil.java Mon Jan 14
08:44:06 2013
@@ -40,11 +40,11 @@ public interface SSLUtil {
*
* @return Array of SSL cipher suites that may be enabled (which may be
* empty if none of the specified ciphers are supported), or
- * the defaults for the underlying SSL implementation if
+ * the defaults for the underlying SSL implementation if
* the endpoint configuration does not specify any ciphers.
*/
public String[] getEnableableCiphers(SSLContext context);
-
+
/**
* Determines the SSL protocol variants that can be enabled, based on the
* configuration of the endpoint and the ciphers supported by the SSL
@@ -54,7 +54,7 @@ public interface SSLUtil {
*
* @return Array of SSL protocol variants that may be enabled (which may be
* empty if none of the specified protocols are supported), or
- * the defaults for the underlying SSL implementation if
+ * the defaults for the underlying SSL implementation if
* the endpoint configuration does not specify any protocols.
*/
public String[] getEnableableProtocols(SSLContext context);
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=1432839&r1=1432838&r2=1432839&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Mon Jan 14 08:44:06 2013
@@ -214,7 +214,7 @@ public class JSSESocketFactory implement
return context.getDefaultSSLParameters().getCipherSuites();
}
- List<String> requestedCiphers = new ArrayList<String>();
+ List<String> requestedCiphers = new ArrayList<>();
for (String rc : requestedCiphersStr.split(",")) {
final String cipher = rc.trim();
if (cipher.length() > 0) {
@@ -224,7 +224,7 @@ public class JSSESocketFactory implement
if (requestedCiphers.isEmpty()) {
return context.getDefaultSSLParameters().getCipherSuites();
}
- List<String> ciphers = new ArrayList<String>(requestedCiphers);
+ List<String> ciphers = new ArrayList<>(requestedCiphers);
ciphers.retainAll(Arrays.asList(context.getSupportedSSLParameters()
.getCipherSuites()));
@@ -235,7 +235,7 @@ public class JSSESocketFactory implement
if (log.isDebugEnabled()) {
log.debug(sm.getString("jsse.enableable_ciphers", ciphers));
if (ciphers.size() != requestedCiphers.size()) {
- List<String> skipped = new ArrayList<String>(requestedCiphers);
+ List<String> skipped = new ArrayList<>(requestedCiphers);
skipped.removeAll(ciphers);
log.debug(sm.getString("jsse.unsupported_ciphers", skipped));
}
@@ -684,7 +684,7 @@ public class JSSESocketFactory implement
return context.getDefaultSSLParameters().getProtocols();
}
- List<String> protocols = new ArrayList<String>(
+ List<String> protocols = new ArrayList<>(
Arrays.asList(requestedProtocols));
protocols.retainAll(Arrays.asList(context.getSupportedSSLParameters()
.getProtocols()));
@@ -696,7 +696,7 @@ public class JSSESocketFactory implement
if (log.isDebugEnabled()) {
log.debug(sm.getString("jsse.enableable_protocols", protocols));
if (protocols.size() != requestedProtocols.length) {
- List<String> skipped = new ArrayList<String>(
+ List<String> skipped = new ArrayList<>(
Arrays.asList(requestedProtocols));
skipped.removeAll(protocols);
log.debug(sm.getString("jsse.unsupported_protocols", skipped));
@@ -729,7 +729,7 @@ public class JSSESocketFactory implement
socket.setEnabledCipherSuites(enabledCiphers);
socket.setEnabledProtocols(enabledProtocols);
-
+
// we don't know if client auth is needed -
// after parsing the request we may re-handshake
configureClientAuth(socket);
Modified: tomcat/trunk/webapps/docs/config/http.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1432839&r1=1432838&r2=1432839&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/trunk/webapps/docs/config/http.xml Mon Jan 14 08:44:06 2013
@@ -1024,7 +1024,7 @@
connections. If specified, only the protocols that are listed and
supported by the SSL implementation will be enabled. If not specified,
the JVM default is used. The permitted values may be obtained from the
- JVM documentation for the allowed values for
+ JVM documentation for the allowed values for
<code>SSLSocket.setEnabledProtocols()</code> e.g.
<a
href="http://docs.oracle.com/javase/6/docs/technotes/guides/security/StandardNames.html#jssenames";>
Oracle Java 6</a> and
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
