This is an automated email from the ASF dual-hosted git repository. ieugen pushed a commit to branch JAMES-2330-randymo-master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit f465dae00fc7d2b7fc664f711fa5ebf1ed0dd66f Author: randymo <randymo@localhost> AuthorDate: Fri Feb 2 19:48:43 2018 -0500 JAMES-2330: Give ability to override AbstractConfigurableAsyncServer.buildSSLContext --- .../lib/netty/AbstractConfigurableAsyncServer.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java index 77a63a1..e9cc68f 100644 --- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java +++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java @@ -105,7 +105,7 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe private String secret; - private Encryption encryption; + protected Encryption encryption; protected String jmxName; @@ -386,8 +386,7 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe * * @throws Exception */ - - private void buildSSLContext() throws Exception { + protected void buildSSLContext() throws Exception { if (useStartTLS || useSSL) { FileInputStream fis = null; try { @@ -431,7 +430,7 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe */ @Override public String getSocketType() { - if (encryption != null && !encryption.isStartTLS()) { + if (getEncryption() != null && !getEncryption().isStartTLS()) { return "secure"; } return "plain"; @@ -439,7 +438,7 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe @Override public boolean getStartTLSSupported() { - return encryption != null && encryption.isStartTLS(); + return getEncryption() != null && getEncryption().isStartTLS(); } @Override @@ -562,16 +561,16 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe enabledCipherSuites, getExecutionHandler(), getFrameHandlerFactory(), timer) { @Override protected SSLContext getSSLContext() { - if (encryption == null) { + if (getEncryption() == null) { return null; } else { - return encryption.getContext(); + return getEncryption().getContext(); } } @Override protected boolean isSSLSocket() { - return encryption != null && !encryption.isStartTLS(); + return getEncryption() != null && !getEncryption().isStartTLS(); } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org