diff options
author | kwilk | 2011-02-02 00:59:41 +0000 |
---|---|---|
committer | Ryan D. Brooks | 2011-02-02 00:59:41 +0000 |
commit | ded715535112caac4e7ff37dcc80d8ab30ca6229 (patch) | |
tree | f89c49c1a45e398ff7cedeb8638fe6b89ba02ecc | |
parent | 93da97b0a665b4f5dfe03cdfa63b70833b9951ef (diff) | |
download | org.eclipse.osee-ded715535112caac4e7ff37dcc80d8ab30ca6229.tar.gz org.eclipse.osee-ded715535112caac4e7ff37dcc80d8ab30ca6229.tar.xz org.eclipse.osee-ded715535112caac4e7ff37dcc80d8ab30ca6229.zip |
bug[ats_2ZQMX]: Fix incorrect version of artifact loaded after changing staticId attribute
2 files changed, 5 insertions, 3 deletions
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactCache.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactCache.java index 620dd30143c..3ea5d29e155 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactCache.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactCache.java @@ -119,7 +119,7 @@ public final class ArtifactCache { public static void cacheByStaticId(Artifact artifact) throws OseeCoreException { for (String staticId : artifact.getAttributesToStringList(CoreAttributeTypes.StaticId)) { - ACTIVE_CACHE.cacheByStaticId(staticId, artifact); + cacheByStaticId(staticId, artifact); } } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactLoader.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactLoader.java index 36d82143db0..0dd627ce713 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactLoader.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactLoader.java @@ -122,8 +122,10 @@ public final class ArtifactLoader { if (confirmer == null || confirmer.canProceed(loadedItems.size())) { loadArtifactsData(queryId, loadedItems, loadLevel, reload, historical, allowDeleted); - for (Artifact artifact : loadedItems) { - ArtifactCache.cacheByStaticId(artifact); + if (!historical) { + for (Artifact artifact : loadedItems) { + ArtifactCache.cacheByStaticId(artifact); + } } } } finally { |