Made all requested changes in VMTransport.java and cleaned up imports as per feedback

Author: Pradeep Kunchala

activemq-broker/src/main/java/org/apache/activemq/transport/vm/VMTransport.java

@@ -20,14 +20,12 @@
 import java.io.InterruptedIOException;
 import java.net.URI;
 import java.security.cert.X509Certificate;
-import java.sql.PreparedStatement;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.*;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 
-import jakarta.jms.JMSException;
 import org.apache.activemq.command.*;
 import org.apache.activemq.openwire.OpenWireFormat;
 import org.apache.activemq.thread.Task;
@@ -72,9 +70,6 @@ public class VMTransport implements Transport, Task {
 
     private volatile int receiveCounter;
 
-    private final List<TransportListener> listeners = new CopyOnWriteArrayList<>();
-    private final ExecutorService executor = Executors.newCachedThreadPool();
-
     public VMTransport(URI location) {
         this.location = location;
         this.id = NEXT_ID.getAndIncrement();
@@ -116,8 +111,7 @@ public void oneway(Object command) throws IOException {
                     ByteSequence data = wf.marshal(original);
                     toSend = (ActiveMQMessage) wf.unmarshal(data);
                 } catch (IOException e) {
-                    LOG.warn("Failed to marshal/unmarshal ActiveMQMessage, sending original", e);
-                    toSend = command;
+                    throw new RuntimeException("Failed to deep copy MessageDispatch in VM transport", e);
                 }
             }
 
@@ -154,6 +148,7 @@ public void oneway(Object command) throws IOException {
 
             // Dispatch to listener
             dispatch(peer, peer.messageQueue, toSend);
+            return;
 
         } catch (InterruptedException e) {
             Thread.currentThread().interrupt();
@@ -162,7 +157,6 @@ public void oneway(Object command) throws IOException {
             throw iioe;
         }
 
-        dispatch(peer, peer.messageQueue, command);
     }
 
     public void dispatch(VMTransport transport, BlockingQueue<Object> pending, Object command) {

activemq-unit-tests/src/test/java/org/apache/activemq/transport/vm/VMTransportDefensiveCopyTest.java

@@ -1,21 +1,46 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.activemq.transport.vm;
 
-import jakarta.jms.*;
+import jakarta.jms.Connection;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.Session;
+import jakarta.jms.Topic;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.TextMessage;
+import jakarta.jms.JMSException;
+
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.BrokerService;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.*;
+import java.util.ArrayList;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotSame;
 
-import java.util.concurrent.*;
-
 
 public class VMTransportDefensiveCopyTest {