bug: Fix exceptions when branch has no parent branch
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitIntoParentCompoundContributionItem.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitIntoParentCompoundContributionItem.java
index ca53f36..82c7adc 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitIntoParentCompoundContributionItem.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitIntoParentCompoundContributionItem.java
@@ -72,10 +72,12 @@
Command command = configCommandParameter(commandId);
CommandContributionItem contributionItem = null;
- contributionItem = createCommand(selectedBranch, commandId);
+ if (selectedBranch.hasParentBranch()) {
+ contributionItem = createCommand(selectedBranch, commandId);
- if (command != null && command.isEnabled()) {
- contributionItems.add(contributionItem);
+ if (command != null && command.isEnabled()) {
+ contributionItems.add(contributionItem);
+ }
}
} catch (OseeCoreException ex) {
OseeLog.log(Activator.class, Level.SEVERE, ex);
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/PurgeBranchDatabaseCallable.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/PurgeBranchDatabaseCallable.java
index 0fc7a1d..c3f511b 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/PurgeBranchDatabaseCallable.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/PurgeBranchDatabaseCallable.java
@@ -62,7 +62,9 @@
purgeFromTable(connection, DELETE_FROM_TX_DETAILS, 0.09, branchId);
purgeFromTable(connection, DELETE_FROM_CONFLICT, 0.01, branchId);
- purgeFromTable(connection, DELETE_FROM_MERGE, 0.01, branchId, branch.getParentBranch().getId());
+ if (branch.hasParentBranch()) {
+ purgeFromTable(connection, DELETE_FROM_MERGE, 0.01, branchId, branch.getParentBranch().getId());
+ }
purgeFromTable(connection, DELETE_FROM_BRANCH_TABLE, 0.01, branchId);
purgeAccessControlTables(branchId);
