Changeset 6516

Timestamp:

Aug 14, 2014, 1:12:11 PM (8 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1833: Item overview load incorrect platform variants

This was a problem with caching a platform even if the variants was different, and then always adding a "variant" subnode, not checking if it already existed or not.

File:

• branches/3.3-stable/src/core/net/sf/basedb/util/overview/loader/PlatformLoader.java (modified) (2 diffs)

branches/3.3-stable/src/core/net/sf/basedb/util/overview/loader/PlatformLoader.java

@@ -89 +89 @@
       denied = true;
     }
-    Node platformNode = createItemNode(nf, platform, platform, denied, parentNode, ChildNodeDirection.NONE);
-    if (platformNode != null && variant != null)
+    Node platformNode = createItemNode(nf, platform, variant != null ? variant : platform, denied, parentNode, ChildNodeDirection.NONE);
+    if (platformNode != null && variant != null && platformNode.getChild("variant") == null)
     {
       NodeNameGenerator<PlatformVariant> nameGenerator = 
@@ -96 +96 @@
       NodeFactory<PlatformVariant> variantNodeFactory = 
         new NodeFactory<PlatformVariant>(dc, context, null, nameGenerator);
-      variantNodeFactory.createNode(variant, variant, platformNode, ChildNodeDirection.NONE);
+      variantNodeFactory.createNode(variant, null, platformNode, ChildNodeDirection.NONE);
     }
     return platformNode;