bug[ats_ATS113799]: Stop remote call from happening all the time

1 files changed, 6 insertions, 1 deletions

diff --git a/org.eclipse.ote.ui.message/src/org/eclipse/ote/ui/message/tree/WatchedMessageNode.java b/org.eclipse.ote.ui.message/src/org/eclipse/ote/ui/message/tree/WatchedMessageNode.java
index c0e8a7493..5f3394b5a 100644
--- a/org.eclipse.ote.ui.message/src/org/eclipse/ote/ui/message/tree/WatchedMessageNode.java
+++ b/org.eclipse.ote.ui.message/src/org/eclipse/ote/ui/message/tree/WatchedMessageNode.java
@@ -17,6 +17,7 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicLong;
 
 import org.eclipse.nebula.widgets.xviewer.XViewerColumn;
@@ -50,6 +51,7 @@ public class WatchedMessageNode extends MessageNode {
    private volatile long lastUpdateNumber = -1;
 
    private Map<ElementPath, String> valueMap;
+   private Set<DataType> availableTypes;
    
    public WatchedMessageNode(IMessageSubscription subscription) {
       super(subscription.getMessageClassName());
@@ -100,6 +102,9 @@ public class WatchedMessageNode extends MessageNode {
          WatchedElementNode elementNode = (WatchedElementNode) child;
          elementNode.setResolved(isResolved);
       }
+      if(isResolved){
+         availableTypes = getSubscription().getAvailableTypes();
+      }
    }
 
    @Override
@@ -193,7 +198,7 @@ public class WatchedMessageNode extends MessageNode {
          return MessageNode.errorImg;
       }
       boolean isWriter = subscription.getMessageMode() == MessageMode.WRITER;
-      boolean hasOptions = getSubscription().getAvailableTypes().size() > 1;
+      boolean hasOptions = availableTypes != null && availableTypes.size() > 1;
       return getMessageIcon(getSubscription().getMemType().name(), isWriter, hasOptions);
    }