Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonald.g.dunne2018-08-01 19:42:22 -0400
committerDonald Dunne2018-09-05 14:52:30 -0400
commit1d4714f136d7aeb36d5449250eec9bea673955f6 (patch)
tree351c24fd627d2135e792ff245b8180902e6f7684
parent869ec12f2c5ede2f3928c3f2e617a95ff60e9382 (diff)
downloadorg.eclipse.osee-1d4714f136d7aeb36d5449250eec9bea673955f6.tar.gz
org.eclipse.osee-1d4714f136d7aeb36d5449250eec9bea673955f6.tar.xz
org.eclipse.osee-1d4714f136d7aeb36d5449250eec9bea673955f6.zip
feature[ats_TW6468]: Fix Show Related Requirements
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AbstractAtsBranchService.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AbstractAtsBranchService.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AbstractAtsBranchService.java
index 2e26c6d299..e44464c7d5 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AbstractAtsBranchService.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AbstractAtsBranchService.java
@@ -87,8 +87,7 @@ public abstract class AbstractAtsBranchService implements IAtsBranchService {
public IOseeBranch getWorkingBranch(IAtsTeamWorkflow teamWf, boolean force) {
long now = new Date().getTime();
boolean notSet = idToWorkingBranchCacheUpdated.get(teamWf.getAtsId()) == null;
- if (AtsUtil.isInTest() || notSet || force || now - idToWorkingBranchCacheUpdated.get(
- teamWf.getAtsId()) > 1000) {
+ if (AtsUtil.isInTest() || notSet || force || now - idToWorkingBranchCacheUpdated.get(teamWf.getAtsId()) > 1000) {
IOseeBranch branch = IOseeBranch.SENTINEL;
try {
IOseeBranch workingBranch = getWorkingBranchExcludeStates(teamWf, BranchState.REBASELINED,
@@ -627,7 +626,7 @@ public abstract class AbstractAtsBranchService implements IAtsBranchService {
@Override
public BranchId getWorkingBranchInWork(IAtsTeamWorkflow teamWf) {
IOseeBranch branch = getWorkingBranch(teamWf);
- if (branch != null && (getBranchState(branch).isCreated() || getBranchState(branch).isModified())) {
+ if (branch.isValid() && (getBranchState(branch).isCreated() || getBranchState(branch).isModified())) {
return branch;
}
return BranchId.SENTINEL;

Back to the top