diff options
| author | rescobar | 2009-11-26 00:42:31 +0000 |
|---|---|---|
| committer | rescobar | 2009-11-26 00:42:31 +0000 |
| commit | 52cb0dc359227a6217ae2b4b9830df33f9a635ae (patch) | |
| tree | 5431e4e8b2cb6d40e15aff79a7d1a25cbf256499 /org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java | |
| parent | de48fbb866088b633f3c4be5c67f213492e97234 (diff) | |
| download | org.eclipse.osee-52cb0dc359227a6217ae2b4b9830df33f9a635ae.tar.gz org.eclipse.osee-52cb0dc359227a6217ae2b4b9830df33f9a635ae.tar.xz org.eclipse.osee-52cb0dc359227a6217ae2b4b9830df33f9a635ae.zip | |
Diffstat (limited to 'org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java')
| -rw-r--r-- | org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java index 9c2a80f4989..6e7c1353008 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java @@ -158,7 +158,7 @@ public class AtsBranchManager { Collection<TransactionRecord> transactions =
TransactionManager.getCommittedArtifactTransactionIds(smaMgr.getSma());
for (TransactionRecord transId : transactions) {
- if (transId.getBranch().equals(branch)) {
+ if (transId.getBranchId() == branch.getId()) {
if (smaMgr.getBranchMgr().isMergeBranchExists(branch)) {
return CommitStatus.Committed_With_Merge;
} else {
@@ -186,7 +186,7 @@ public class AtsBranchManager { getWorkingBranch()).getFirst());
} else if (isCommittedBranchExists()) {
for (TransactionRecord transactionId : getTransactionIds(true)) {
- if (transactionId.getBranch() == destinationBranch) {
+ if (transactionId.getBranchId() == destinationBranch.getId()) {
MergeView.openView(transactionId);
}
@@ -833,7 +833,7 @@ public class AtsBranchManager { } finally {
if (workflowWorkingBranch != null) {
branchesInCommit.remove(workflowWorkingBranch);
- }
+ }
}
return Status.OK_STATUS;
}
|