On 10/5/2018 2:40 AM, Mark Thomas wrote:
On 04/10/18 22:07, isa...@apache.org wrote:
Author: isapir
Date: Thu Oct 4 21:07:54 2018
New Revision: 1842849
URL: http://svn.apache.org/viewvc?rev=1842849&view=rev
Log:
System.load() expects absolute path.
Remember to consider whether or not any changes you make to trunk should
be back-ported to 8.5.x and 7.0.x. Generally, changes are back-ported
unless they require changing a public API (as defined in RELEASE-NOTES)
or are considering likely to cause a regression.
Got it. I will set up the other branches locally. So far working
mostly with trunk.
<snip/>
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=1842849&r1=1842848&r2=1842849&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
Thu Oct 4 21:07:54 2018
@@ -87,7 +87,11 @@ public class TestOpenSSLConf extends Tom
@Test
public void testOpenSSLConfCmdCipher() throws Exception {
- log.info("Found OpenSSL version 0x" +
Integer.toHexString(OPENSSL_VERSION));
+ if (TesterSupport.isOpensslAvailable())
+ log.info("Found OpenSSL version 0x" +
Integer.toHexString(OPENSSL_VERSION));
+ else
+ log.warn("OpenSSL not found: " + TesterSupport.OPENSSL_ERROR);
+
The Tomcat style is to always use { and } even for one line for clarity.
Due to the age of the code base, there are a mix of styles. Generally,
we try and move code towards the currently accepted style as we change it.
Understood. I usually try to look at existing code to understand the
style and that mix always threw me off. Thanks for clarifying.
Igal
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
