Fixed undoEco bug

Signed-off-by: Jaehyun Kim <[email protected]>

Author: jhkim-pii

src/odb/src/db/dbJournal.cpp

@@ -2291,10 +2291,10 @@ void dbJournal::undo_connectObject()
       // disconnecting the dbNet then in the journalling for
       // the caller we set the mnet_id to zero.
       //
+      assert(net_id != 0 || mnet_id != 0);
       if (net_id != 0) {
         iterm->disconnectDbNet();
-      }
-      if (mnet_id != 0) {
+      } else if (mnet_id != 0) {
         iterm->disconnectDbModNet();
       }
       break;
@@ -2319,7 +2319,12 @@ void dbJournal::undo_connectObject()
           bterm->getName(),
           net_id,
           mnet_id);
-      bterm->disconnect();
+      assert(net_id != 0 || mnet_id != 0);
+      if (net_id != 0) {
+        bterm->disconnectDbNet();
+      } else if (mnet_id != 0) {
+        bterm->disconnectDbModNet();
+      }
       break;
     }
 

src/odb/src/db/dbModBTerm.cpp

@@ -332,6 +332,13 @@ void dbModBTerm::connect(dbModNet* net)
   if (_modbterm->_modnet == net->getId()) {
     return;
   }
+
+  // If the modbterm is already connected to a different modnet, disconnect it
+  // first.
+  if (_modbterm->_modnet != 0) {
+    disconnect();
+  }
+
   for (auto callback : _block->_callbacks) {
     callback->inDbModBTermPreConnect(this, net);
   }