Author: markt
Date: Wed Jan 18 11:23:17 2017
New Revision: 1779313
URL: http://svn.apache.org/viewvc?rev=1779313&view=rev
Log:
ws police (I need to configure my Java 9 dev environment correctly)
Modified:
tomcat/trunk/java/org/apache/tomcat/util/compat/Jre9Compat.java
tomcat/trunk/java/org/apache/tomcat/util/compat/JreCompat.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/compat/Jre9Compat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/compat/Jre9Compat.java?rev=1779313&r1=1779312&r2=1779313&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/compat/Jre9Compat.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/compat/Jre9Compat.java Wed Jan 18
11:23:17 2017
@@ -29,7 +29,7 @@ class Jre9Compat extends JreCompat {
static {
Class<?> c1 = null;
Method m2 = null;
-
+
try {
c1 =
Class.forName("java.lang.reflect.InaccessibleObjectException");
SSLParameters.class.getMethod("setApplicationProtocolsMethod",
String[].class);
@@ -56,14 +56,14 @@ class Jre9Compat extends JreCompat {
return inaccessibleObjectExceptionClazz.isAssignableFrom(t.getClass());
}
-
-
+
+
@Override
- public void setApplicationProtocols(SSLParameters sslParameters,
String[] protocols) {
- try {
- setApplicationProtocolsMethod.invoke(sslParameters,
(Object) protocols);
- } catch (IllegalAccessException | IllegalArgumentException |
InvocationTargetException e) {
- throw new UnsupportedOperationException(e);
- }
+ public void setApplicationProtocols(SSLParameters sslParameters, String[]
protocols) {
+ try {
+ setApplicationProtocolsMethod.invoke(sslParameters, (Object)
protocols);
+ } catch (IllegalAccessException | IllegalArgumentException |
InvocationTargetException e) {
+ throw new UnsupportedOperationException(e);
+ }
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/compat/JreCompat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/compat/JreCompat.java?rev=1779313&r1=1779312&r2=1779313&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/compat/JreCompat.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/compat/JreCompat.java Wed Jan 18
11:23:17 2017
@@ -73,16 +73,16 @@ public class JreCompat {
// Exception does not exist prior to Java 9
return false;
}
-
-
+
+
/**
* Set the application protocols the server will accept for ALPN
- *
- * @param sslParameters The SSL parameters for a connection
- * @param protocols The application protocols to be allowed
for that
- * connection
+ *
+ * @param sslParameters The SSL parameters for a connection
+ * @param protocols The application protocols to be allowed for that
+ * connection
*/
public void setApplicationProtocols(SSLParameters sslParameters, String[]
protocols) {
- throw new
UnsupportedOperationException(sm.getString("jreCompat.noApplicationProtocols"));
+ throw new
UnsupportedOperationException(sm.getString("jreCompat.noApplicationProtocols"));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
