diff options
author | megumi.telles | 2015-11-24 18:54:15 +0000 |
---|---|---|
committer | Megumi Telles | 2015-11-30 16:34:37 +0000 |
commit | 17d8a97079c1ace7e69209a438452515068be9ac (patch) | |
tree | 80757a167bf91915eb9ab8c528d691c84e2c5bfb | |
parent | 54d537d65410110570d632242c935fccf706e341 (diff) | |
download | org.eclipse.osee-17d8a97079c1ace7e69209a438452515068be9ac.tar.gz org.eclipse.osee-17d8a97079c1ace7e69209a438452515068be9ac.tar.xz org.eclipse.osee-17d8a97079c1ace7e69209a438452515068be9ac.zip |
bug[ats_ATS258325]: Fix Finish Updating not working
-rw-r--r-- | plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AbstractAtsBranchService.java | 15 |
1 files changed, 7 insertions, 8 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 9648ddecaba..74f59c4c8f8 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 @@ -93,13 +93,13 @@ 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 (AtsUtilCore.isInTest() || notSet || force || (now - idToWorkingBranchCacheUpdated.get(teamWf.getAtsId()) > 1000)) { + if (AtsUtilCore.isInTest() || notSet || force || (now - idToWorkingBranchCacheUpdated.get( + teamWf.getAtsId()) > 1000)) { IOseeBranch branch = null; try { - branch = - getWorkingBranchExcludeStates(teamWf, BranchState.REBASELINED, BranchState.DELETED, BranchState.PURGED, - BranchState.COMMIT_IN_PROGRESS, BranchState.CREATION_IN_PROGRESS, BranchState.DELETE_IN_PROGRESS, - BranchState.PURGE_IN_PROGRESS, BranchState.REBASELINE_IN_PROGRESS); + branch = getWorkingBranchExcludeStates(teamWf, BranchState.REBASELINED, BranchState.DELETED, + BranchState.PURGED, BranchState.COMMIT_IN_PROGRESS, BranchState.CREATION_IN_PROGRESS, + BranchState.DELETE_IN_PROGRESS, BranchState.PURGE_IN_PROGRESS); } catch (ItemDoesNotExist ex) { // do nothing } @@ -350,9 +350,8 @@ public abstract class AbstractAtsBranchService implements IAtsBranchService { } } if (branch == null) { - String branchUuid = - atsServices.getAttributeResolver().getSoleAttributeValueAsString(configObject, - AtsAttributeTypes.BaselineBranchUuid, ""); + String branchUuid = atsServices.getAttributeResolver().getSoleAttributeValueAsString(configObject, + AtsAttributeTypes.BaselineBranchUuid, ""); if (Strings.isValid(branchUuid)) { branch = getBranchByUuid(Long.valueOf(branchUuid)); } |