Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmisinco2013-07-09 17:51:29 -0400
committerjmisinco2013-07-09 17:51:34 -0400
commit7677a938f6398ea7138c28fda54605ba324a1828 (patch)
tree004b1f09e12b8508f15b410e3ed03cc258b48523
parent0f3f0522e0f9991fa9aae37f9bbe22c6abf55957 (diff)
downloadorg.eclipse.osee-7677a938f6398ea7138c28fda54605ba324a1828.tar.gz
org.eclipse.osee-7677a938f6398ea7138c28fda54605ba324a1828.tar.xz
org.eclipse.osee-7677a938f6398ea7138c28fda54605ba324a1828.zip
refinement[ats_R7FT2]: Remove temporary change report reload code
The option to pass the reload parameter was removed as we do not want to reload the branch cache if no merge branch exists. Since we have been running with the reload completely disabled, this should be a safe change. Change-Id: I2de472bc9dafaeefc1d1390670d7902c147a3878
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java19
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadCompareBranchToBranch.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/UpdateChangeUiData.java2
3 files changed, 4 insertions, 19 deletions
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java
index eee280137d..72dcbf18b0 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java
@@ -44,7 +44,6 @@ import org.eclipse.osee.framework.core.operation.CompositeOperation;
import org.eclipse.osee.framework.core.operation.IOperation;
import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.core.util.Conditions;
-import org.eclipse.osee.framework.database.core.OseeInfo;
import org.eclipse.osee.framework.database.core.SQL3DataType;
import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.jdk.core.util.Strings;
@@ -182,26 +181,12 @@ public class BranchManager {
* returns the merge branch for this source destination pair from the cache or null if not found
*/
public static MergeBranch getMergeBranch(Branch sourceBranch, Branch destinationBranch) throws OseeCoreException {
- return getMergeBranch(sourceBranch, destinationBranch, true);
- }
-
- public static MergeBranch getMergeBranch(Branch sourceBranch, Branch destinationBranch, boolean isReLoadAllowed) throws OseeCoreException {
- BranchCache cache = getCache();
- // If someone else made a branch on another machine, we may not know about it
- // so refresh the cache.
- MergeBranch mergeBranch = cache.findMergeBranch(sourceBranch, destinationBranch);
- if (OseeInfo.isCacheEnabled(MERGE_RELOAD_KEY)) {
- if (mergeBranch == null && isReLoadAllowed) {
- if (cache.reloadCache()) {
- mergeBranch = cache.findMergeBranch(sourceBranch, destinationBranch);
- }
- }
- }
+ MergeBranch mergeBranch = getCache().findMergeBranch(sourceBranch, destinationBranch);
return mergeBranch;
}
public static boolean doesMergeBranchExist(Branch sourceBranch, Branch destBranch) throws OseeCoreException {
- return getMergeBranch(sourceBranch, destBranch, false) != null;
+ return getMergeBranch(sourceBranch, destBranch) != null;
}
public static Branch getBranch(Integer branchId) throws OseeCoreException {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadCompareBranchToBranch.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadCompareBranchToBranch.java
index 07375c95e7..313c32af3c 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadCompareBranchToBranch.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadCompareBranchToBranch.java
@@ -47,7 +47,7 @@ public class LoadCompareBranchToBranch extends AbstractOperation {
TransactionDelta txDelta = new TransactionDelta(startTx, endTx);
uiData.setTxDelta(txDelta);
- Branch mergeBranch = BranchManager.getMergeBranch(startBranch, otherBranch, true);
+ Branch mergeBranch = BranchManager.getMergeBranch(startBranch, otherBranch);
uiData.setMergeBranch(mergeBranch);
if (otherBranch.equals(startBranch.getParentBranch())) {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/UpdateChangeUiData.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/UpdateChangeUiData.java
index 98cd90c104..9f0cfd8c13 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/UpdateChangeUiData.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/UpdateChangeUiData.java
@@ -49,7 +49,7 @@ public class UpdateChangeUiData extends AbstractOperation {
if (!txDelta.areOnTheSameBranch()) {
Branch mergeBranch =
- BranchManager.getMergeBranch(txDelta.getStartTx().getBranch(), txDelta.getEndTx().getBranch(), true);
+ BranchManager.getMergeBranch(txDelta.getStartTx().getBranch(), txDelta.getEndTx().getBranch());
changeData.setMergeBranch(mergeBranch);
}
boolean areBranchesValid = !hasBeenRebaselined(txDelta.getStartTx()) && !hasBeenRebaselined(txDelta.getEndTx());

Back to the top