Fix SmtpConnectionPool not reusing connections

SmtpConnectionPool has a feature where it can close connections that are
returned to the pool when either
a) they reach a maximum lifetime
b) they reach a maximum number of messages sent.
A bug in the comparison of the supplied values and the actual values
(e.g. configured max lifetime and the actual lifetime) caused
connections being closed immediately after first use. This is now fixed.

Change-Id: I0c6b480ef75ccac5a5b993703eefbc85bf86e1ad
Signed-off-by: Michael Iseli <michael.iseli@bsi-software.com>
Reviewed-on: https://git.eclipse.org/r/149846
Tested-by: CI Bot
Reviewed-by: Stephan Merkli <stephan.merkli@bsi-software.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/org.eclipse.scout.rt.mail/src/main/java/org/eclipse/scout/rt/mail/smtp/SmtpConnectionPool.java b/org.eclipse.scout.rt.mail/src/main/java/org/eclipse/scout/rt/mail/smtp/SmtpConnectionPool.java
index 07aae2e386..5ca9a93243 100644
--- a/org.eclipse.scout.rt.mail/src/main/java/org/eclipse/scout/rt/mail/smtp/SmtpConnectionPool.java
+++ b/org.eclipse.scout.rt.mail/src/main/java/org/eclipse/scout/rt/mail/smtp/SmtpConnectionPool.java
@@ -263,11 +263,11 @@ public class SmtpConnectionPool {
 
   protected P_ReuseCheckResult isReuseAllowed(SmtpConnectionPoolEntry smtpConnectionPoolEntry) {
     IDateProvider dateProvider = BEANS.get(IDateProvider.class);
-    if (dateProvider.currentMillis().getTime() - smtpConnectionPoolEntry.getCreateTime() < m_maxConnectionLifetime) {
+    if (dateProvider.currentMillis().getTime() - smtpConnectionPoolEntry.getCreateTime() >= m_maxConnectionLifetime) {
       return new P_ReuseCheckResult(false, "pooled connection reached max lifetime of {}s", m_maxConnectionLifetime / 1000d);
     }
     int maxMessagesPerConnection = smtpConnectionPoolEntry.getSmtpServerConfig().getMaxMessagesPerConnection();
-    if (maxMessagesPerConnection > 0 && smtpConnectionPoolEntry.getMessagesSent() < maxMessagesPerConnection) {
+    if (maxMessagesPerConnection > 0 && smtpConnectionPoolEntry.getMessagesSent() >= maxMessagesPerConnection) {
       return new P_ReuseCheckResult(false, "pooled connection reached max messages sent of {}", maxMessagesPerConnection);
     }
     return new P_ReuseCheckResult(true, null);