Author: markt
Date: Mon Aug 4 14:59:31 2014
New Revision: 1615599
URL: http://svn.apache.org/r1615599
Log:
Remove use of Java 8 specific API call
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java?rev=1615599&r1=1615598&r2=1615599&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Mon Aug 4 14:59:31 2014
@@ -24,7 +24,6 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import java.util.concurrent.TimeUnit;
import org.apache.catalina.util.IOTools;
import org.apache.tomcat.util.http.fileupload.ByteArrayOutputStream;
@@ -180,7 +179,7 @@ public class TesterOpenSSL {
t2.start();
try {
- p.waitFor(2, TimeUnit.SECONDS);
+ p.waitFor();
} catch (InterruptedException e) {
throw new IOException(e);
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1615599&r1=1615598&r2=1615599&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Aug 4 14:59:31 2014
@@ -111,6 +111,10 @@
defined as <code>HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5</code> so
that no weak ciphers are enabled by default. (remm)
</fix>
+ <fix>
+ <bug>56810</bug>: Remove use of Java 8 specific API calls in unit tests
+ for OpenSSL to JSSE cipher conversion. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
