diff --git a/pom.xml b/pom.xml index b8acc94aa..8df3f5257 100644 --- a/pom.xml +++ b/pom.xml @@ -171,7 +171,7 @@ - check + apply compile diff --git a/src/main/java/org/redkale/mq/spi/MessageAgent.java b/src/main/java/org/redkale/mq/spi/MessageAgent.java index f3ab1d6c1..5341ed696 100644 --- a/src/main/java/org/redkale/mq/spi/MessageAgent.java +++ b/src/main/java/org/redkale/mq/spi/MessageAgent.java @@ -7,7 +7,6 @@ package org.redkale.mq.spi; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; -import java.nio.charset.StandardCharsets; import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; @@ -554,17 +553,12 @@ public abstract class MessageAgent implements MessageManager { MessageConsumer m = this.consumer; return messageAgent.submit(() -> { Traces.computeIfAbsent(traceid); + T msg = null; try { - m.onMessage(context, (T) c.convertFrom(messageType, message)); + msg = (T) c.convertFrom(messageType, message); + m.onMessage(context, msg); } catch (Throwable t) { - messageAgent - .getLogger() - .log( - Level.SEVERE, - m.getClass().getSimpleName() - + " onMessage error, topic: " + context.getTopic() - + ", messages: " + new String(message, StandardCharsets.UTF_8), - t); + messageAgent.getLogger().log(Level.SEVERE, "MessageConsumer.onMessage error, message: " + msg, t); } Traces.removeTraceid(); }); diff --git a/src/main/java/org/redkale/mq/spi/MessageAsmMethodBoost.java b/src/main/java/org/redkale/mq/spi/MessageAsmMethodBoost.java index f2aefc141..32747c971 100644 --- a/src/main/java/org/redkale/mq/spi/MessageAsmMethodBoost.java +++ b/src/main/java/org/redkale/mq/spi/MessageAsmMethodBoost.java @@ -340,8 +340,12 @@ public class MessageAsmMethodBoost extends AsmMethodBoost { try { if (Utility.isNotEmpty(consumerBytes)) { if (newLoader == null) { - newLoader = new RedkaleClassLoader.DynBytesClassLoader( - classLoader == null ? Thread.currentThread().getContextClassLoader() : classLoader); + if (classLoader instanceof RedkaleClassLoader.DynBytesClassLoader) { + newLoader = (RedkaleClassLoader.DynBytesClassLoader) classLoader; + } else { + newLoader = new RedkaleClassLoader.DynBytesClassLoader( + classLoader == null ? Thread.currentThread().getContextClassLoader() : classLoader); + } } List> consumers = new ArrayList<>(); consumerBytes.forEach((clzName, bytes) -> {