Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/ConsolidateRelationsTxOperation.java')
-rw-r--r--plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/ConsolidateRelationsTxOperation.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/ConsolidateRelationsTxOperation.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/ConsolidateRelationsTxOperation.java
index e39b5136077..fe9da980a10 100644
--- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/ConsolidateRelationsTxOperation.java
+++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/ConsolidateRelationsTxOperation.java
@@ -41,7 +41,8 @@ public class ConsolidateRelationsTxOperation extends AbstractDbTxOperation {
private static final String UPDATE_TXS_GAMMAS =
"update osee_txs set gamma_id = ?, mod_type = ?, tx_current = ? where transaction_id = ? and gamma_id = ?";
- private static final String DELETE_TXS = "delete from osee_txs where transaction_id = ? and gamma_id = ?";
+ private static final String DELETE_TXS =
+ "delete from osee_txs where branch_id = ? and transaction_id = ? and gamma_id = ?";
private static final String DELETE_RELATIONS = "delete from osee_relation_link where gamma_id = ?";
@@ -174,7 +175,7 @@ public class ConsolidateRelationsTxOperation extends AbstractDbTxOperation {
netModType = ModificationType.getMod(modType);
netTxCurrent = txCurrent;
} else {
- addressingToDelete.add(new Object[] {transactionId, obsoleteGammaId});
+ addressingToDelete.add(new Object[] {chStmt.getInt("branch_id"), transactionId, obsoleteGammaId});
computeNetAddressing(ModificationType.getMod(modType), txCurrent);
}

Back to the top