You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2021/08/12 20:58:51 UTC

[sling-org-apache-sling-commons-messaging-mail] 02/06: do not deconstruct component, keep it in an usable state

This is an automated email from the ASF dual-hosted git repository.

olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-messaging-mail.git

commit 6ef7792faedd819caa34e0ecb901de57ed052880
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Jul 29 14:23:59 2021 +0200

    do not deconstruct component, keep it in an usable state
---
 .../commons/messaging/mail/internal/SimpleMessageIdProvider.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/sling/commons/messaging/mail/internal/SimpleMessageIdProvider.java b/src/main/java/org/apache/sling/commons/messaging/mail/internal/SimpleMessageIdProvider.java
index 16e128e..23bb2f8 100644
--- a/src/main/java/org/apache/sling/commons/messaging/mail/internal/SimpleMessageIdProvider.java
+++ b/src/main/java/org/apache/sling/commons/messaging/mail/internal/SimpleMessageIdProvider.java
@@ -18,6 +18,7 @@
  */
 package org.apache.sling.commons.messaging.mail.internal;
 
+import java.util.Objects;
 import java.util.UUID;
 
 import jakarta.mail.MessagingException;
@@ -71,12 +72,13 @@ public final class SimpleMessageIdProvider implements MessageIdProvider {
     @SuppressWarnings("unused")
     private void deactivate() {
         logger.debug("deactivating");
-        this.configuration = null;
     }
 
     @Override
     public @NotNull String getMessageId(@NotNull final MimeMessage message) throws MessagingException {
-        return String.format("%s.%s@%s", UUID.randomUUID().toString(), System.currentTimeMillis(), configuration.host());
+        final var configuration = this.configuration;
+        Objects.requireNonNull(configuration, "Configuration must not be null");
+        return String.format("%s.%s@%s", UUID.randomUUID(), System.currentTimeMillis(), configuration.host());
     }
 
 }