diff options
| author | ddunne | 2009-10-10 22:58:02 +0000 |
|---|---|---|
| committer | ddunne | 2009-10-10 22:58:02 +0000 |
| commit | 2d05b98a3a885b17477dc77d0ea61d6ea4b05939 (patch) | |
| tree | ea38010ca72699db7f5fb7624f48ea8bf66fb2f1 /org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java | |
| parent | 4be1cc62863bc1cfef1b0389b72e4f28ca1353bc (diff) | |
| download | org.eclipse.osee-2d05b98a3a885b17477dc77d0ea61d6ea4b05939.tar.gz org.eclipse.osee-2d05b98a3a885b17477dc77d0ea61d6ea4b05939.tar.xz org.eclipse.osee-2d05b98a3a885b17477dc77d0ea61d6ea4b05939.zip | |
Fixed branch regression test hanging
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 | 16 |
1 files changed, 15 insertions, 1 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 208b79c5f03..1fc8f16a4d9 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 @@ -868,10 +868,24 @@ public class AtsBranchManager { * used for developmental testing or automation
*/
public void commitWorkingBranch(final boolean commitPopup, final boolean overrideStateValidation, Branch destinationBranch, boolean archiveWorkingBranch) throws OseeCoreException {
+ commitWorkingBranch(commitPopup, overrideStateValidation, destinationBranch, archiveWorkingBranch, false);
+ }
+
+ public void commitWorkingBranch(final boolean commitPopup, final boolean overrideStateValidation, Branch destinationBranch, boolean archiveWorkingBranch, boolean forcePend) throws OseeCoreException {
if (isBranchInCommit()) {
throw new OseeCoreException("Branch is currently being committed.");
}
- Jobs.startJob(new AtsCommitJob(commitPopup, overrideStateValidation, destinationBranch, archiveWorkingBranch));
+ Job job = new AtsCommitJob(commitPopup, overrideStateValidation, destinationBranch, archiveWorkingBranch);
+ job.setUser(true);
+ job.setPriority(Job.LONG);
+ job.schedule();
+ if (forcePend) {
+ try {
+ job.join();
+ } catch (InterruptedException ex) {
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE, ex);
+ }
+ }
}
/**
|