remove shallow artifact

2 files changed, 4 insertions, 5 deletions

diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/commit/CommitDbOperation.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/commit/CommitDbOperation.java
index a26f89df8e7..9fbc7ec6099 100644
--- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/commit/CommitDbOperation.java
+++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/commit/CommitDbOperation.java
@@ -165,11 +165,11 @@ public class CommitDbOperation extends AbstractDbTxOperation {
 
       getDatabaseService().runPreparedUpdate(connection, INSERT_COMMIT_TRANSACTION,
             TransactionDetailsType.NonBaselined.getId(), destinationBranch.getId(), newTransactionNumber, comment,
-            timestamp, userArtId, sourceBranch.getAssociatedArtifact().getArtId());
+            timestamp, userArtId, sourceBranch.getAssociatedArtifactId());
       TransactionRecord record =
             modelFactory.getOseeFactoryService().getTransactionFactory().create(newTransactionNumber,
-                  destinationBranch.getId(), comment, timestamp, userArtId,
-                  sourceBranch.getAssociatedArtifact().getArtId(), TransactionDetailsType.NonBaselined);
+                  destinationBranch.getId(), comment, timestamp, userArtId, sourceBranch.getAssociatedArtifactId(),
+                  TransactionDetailsType.NonBaselined);
 
       return record;
    }
diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/creation/CreateBranchOperation.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/creation/CreateBranchOperation.java
index 2ae4a0eb850..05c38a0092a 100644
--- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/creation/CreateBranchOperation.java
+++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/creation/CreateBranchOperation.java
@@ -30,7 +30,6 @@ import org.eclipse.osee.framework.core.exception.OseeStateException;
 import org.eclipse.osee.framework.core.message.BranchCreationRequest;

 import org.eclipse.osee.framework.core.message.BranchCreationResponse;

 import org.eclipse.osee.framework.core.model.Branch;

-import org.eclipse.osee.framework.core.model.DefaultBasicArtifact;

 import org.eclipse.osee.framework.core.model.MergeBranch;

 import org.eclipse.osee.framework.core.model.TransactionRecord;

 import org.eclipse.osee.framework.core.model.cache.BranchCache;

@@ -151,7 +150,7 @@ public class CreateBranchOperation extends AbstractDbTxOperation {
                   request.getBranchType(), BranchState.CREATION_IN_PROGRESS, false);

 

       branch.setParentBranch(parentBranch);

-      branch.setAssociatedArtifact(new DefaultBasicArtifact(request.getAssociatedArtifactId(), "", ""));

+      branch.setAssociatedArtifactId(request.getAssociatedArtifactId());

 

       Timestamp timestamp = GlobalTime.GreenwichMeanTimestamp();

       int nextTransactionId = getDatabaseService().getSequence().getNextTransactionId();