bug: Fix some mapping send issues

5 files changed, 22 insertions, 9 deletions

diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/OseeTestThread.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/OseeTestThread.java
index e444d94cb47..925610723e0 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/OseeTestThread.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/OseeTestThread.java
@@ -58,7 +58,7 @@ public abstract class OseeTestThread {
    public OseeTestThread(String name, boolean isDaemon, ThreadGroup group, TestEnvironment env) {
       GCHelper.getGCHelper().addRefWatch(this);
       this.env = new WeakReference<>(env);
-      thread = new Thread(group, name) {
+      thread = new Thread(name) {
 
          @Override
          public void run() {
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/Message.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/Message.java
index b6d385541e4..5e4b4fd47b0 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/Message.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/Message.java
@@ -873,7 +873,7 @@ public class Message implements Xmlizable, XmlizableStream {
     */
    public void send() throws MessageSystemException {
       if(messageManager != null){
-         messageManager.publish(this);
+         messageManager.publish(this, getMemType());
       } else {
          OseeLog.log(getClass(), Level.WARNING, String.format("Unable to send [%s] because message manager has not been set", getName()));
       }
@@ -884,7 +884,11 @@ public class Message implements Xmlizable, XmlizableStream {
       if (!isTurnedOff) {
          Message[] messages = mapper.getMessages(this, type).get();
          for(int i = 0; i < messages.length; i++){
-            messages[i].send();
+            if(messageManager != null){
+               messageManager.publish(this, type);
+            } else {
+               OseeLog.log(getClass(), Level.WARNING, String.format("Unable to send [%s] because message manager has not been set", getName()));
+            }
          }
       } else {
          OseeLog.log(MessageSystemTestEnvironment.class, Level.WARNING,
@@ -894,7 +898,7 @@ public class Message implements Xmlizable, XmlizableStream {
 
    public void send(PublishInfo info) throws MessageSystemException {
       if(messageManager != null){
-         messageManager.publish(this, info);
+         messageManager.publish(this, this.getMemType(), info);
       } else {
          OseeLog.log(getClass(), Level.WARNING, String.format("Unable to send [%s] because message manager has not been set", getName()));
       }
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/MessageController.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/MessageController.java
index b274df27160..0416fe7cc49 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/MessageController.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/MessageController.java
@@ -291,8 +291,13 @@ public class MessageController implements IMessageManager {
 
    @Override
    public void publish(Message msg) {
+      publish(msg, msg.getMemType());
+   }
+   
+   @Override
+   public void publish(Message msg, DataType type) {
       if(!msg.isTurnedOff() && !msg.isDestroyed()){
-         CopyOnWriteNoIteratorList<Message> container = mapper.getMessages(msg, msg.getMemType());
+         CopyOnWriteNoIteratorList<Message> container = mapper.getMessages(msg, type);
          if(container != null){
             Message[] messages = container.get();
             for(int i = 0; i < messages.length; i++){
@@ -308,9 +313,9 @@ public class MessageController implements IMessageManager {
    }
 
    @Override
-   public void publish(Message msg, PublishInfo info) {
+   public void publish(Message msg,  DataType type, PublishInfo info) {
       if(!msg.isTurnedOff() && !msg.isDestroyed()){
-         Message[] messages = mapper.getMessages(msg, msg.getMemType()).get();
+         Message[] messages = mapper.getMessages(msg, type).get();
          for(int i = 0; i < messages.length; i++){
             MessagePublishingHandler publisher = messagePublishingHandlers.get(messages[i].getDefaultMessageData().getIOType());
             if(publisher != null){
@@ -1062,4 +1067,6 @@ public class MessageController implements IMessageManager {
       return listeners;
    }
 
+
+
 }
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/PeriodicPublishTask.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/PeriodicPublishTask.java
index 09f85317841..302a14426c8 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/PeriodicPublishTask.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/PeriodicPublishTask.java
@@ -32,7 +32,7 @@ public class PeriodicPublishTask extends EnvironmentTask implements IMessageDisp
             Message msg = msgs[i];
             if (msg != null && !msg.isDestroyed()) {
                try{
-                  messageManager.publish(msg);
+                  messageManager.publish(msg, msg.getMemType());
                } catch (Throwable th){
                   System.out.println(msg.getName());
                   th.printStackTrace();
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/interfaces/IMessageManager.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/interfaces/IMessageManager.java
index d0a7b7814c1..475ba4a2f64 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/interfaces/IMessageManager.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/interfaces/IMessageManager.java
@@ -87,7 +87,9 @@ public interface IMessageManager {
 
    void publish(Message msg);
    
-   void publish(Message msg, PublishInfo info);
+   void publish(Message msg, DataType type);
+   
+   void publish(Message msg, DataType type, PublishInfo info);
    
    void publishMessages(boolean publish);