You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2017/09/08 13:13:42 UTC
svn commit: r1807755 -
/tomcat/trunk/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java
Author: markt
Date: Fri Sep 8 13:13:42 2017
New Revision: 1807755
URL: http://svn.apache.org/viewvc?rev=1807755&view=rev
Log:
Handle possible NPE in unit test
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java
Modified: tomcat/trunk/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java?rev=1807755&r1=1807754&r2=1807755&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java Fri Sep 8 13:13:42 2017
@@ -41,8 +41,8 @@ public class TestOpenSSLConf extends Tom
String protocol = tomcat.getConnector().getProtocolHandlerClassName();
// The tests are only supported for APR and OpenSSL
if (!protocol.contains("Apr")) {
- String sslImplementation =
- tomcat.getConnector().getProperty("sslImplementationName").toString();
+ String sslImplementation = String.valueOf(
+ tomcat.getConnector().getProperty("sslImplementationName"));
Assume.assumeTrue("This test is only for OpenSSL based SSL connectors",
sslImplementation.contains("openssl"));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1807755 -
/tomcat/trunk/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java
Posted by Mark Thomas <ma...@apache.org>.
On 08/09/17 14:27, Rainer Jung wrote:
> Thanks, you beat me by 10 minutes (and your solution is nicer than mine).
>
> Please do not wait for the docs with tagging. I have a bigger SSL docs
> change in mind which I'll not finish today.
No problem.
I'm not sure if I'll get to the tag today. There is a newly open bug I
want to look at and I'd like to get BZ 61189 implemented as well.
I'll see how things go.
Cheers,
mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1807755 -
/tomcat/trunk/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java
Posted by Rainer Jung <ra...@kippdata.de>.
Thanks, you beat me by 10 minutes (and your solution is nicer than mine).
Please do not wait for the docs with tagging. I have a bigger SSL docs
change in mind which I'll not finish today.
Tanks and Regards,
Rainer
Am 08.09.2017 um 15:13 schrieb markt@apache.org:
> Author: markt
> Date: Fri Sep 8 13:13:42 2017
> New Revision: 1807755
>
> URL: http://svn.apache.org/viewvc?rev=1807755&view=rev
> Log:
> Handle possible NPE in unit test
>
> Modified:
> tomcat/trunk/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java
>
> Modified: tomcat/trunk/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java
> URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java?rev=1807755&r1=1807754&r2=1807755&view=diff
> ==============================================================================
> --- tomcat/trunk/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java (original)
> +++ tomcat/trunk/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java Fri Sep 8 13:13:42 2017
> @@ -41,8 +41,8 @@ public class TestOpenSSLConf extends Tom
> String protocol = tomcat.getConnector().getProtocolHandlerClassName();
> // The tests are only supported for APR and OpenSSL
> if (!protocol.contains("Apr")) {
> - String sslImplementation =
> - tomcat.getConnector().getProperty("sslImplementationName").toString();
> + String sslImplementation = String.valueOf(
> + tomcat.getConnector().getProperty("sslImplementationName"));
> Assume.assumeTrue("This test is only for OpenSSL based SSL connectors",
> sslImplementation.contains("openssl"));
> }
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org