X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=plugins%2Forg.argeo.slc.client.ui.dist%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Fdist%2Fmodel%2FModularDistBaseElem.java;h=35e3f21dd40f01ad2bec30df308913719d180986;hb=524221f25edad4b09aac22555450164e587b304a;hp=08c7d6d3eaee8f9e5222883f2a27aa0dcbcb65c1;hpb=dfe3fcaa16195d0fff84839e86546d753e588253;p=gpl%2Fargeo-slc.git

diff --git a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/ModularDistBaseElem.java b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/ModularDistBaseElem.java
index 08c7d6d3e..35e3f21dd 100644
--- a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/ModularDistBaseElem.java
+++ b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/ModularDistBaseElem.java
@@ -21,6 +21,7 @@ import org.argeo.slc.jcr.SlcTypes;
  */
 public class ModularDistBaseElem extends DistParentElem {
 
+	final static public String AETHER_CATEGORY_BASE = "categoryBase";
 	final static public String AETHER_BINARIES_TYPE = "binaries";
 	final static public String AETHER_DEP_TYPE = "dep";
 	private String type;
@@ -57,7 +58,7 @@ public class ModularDistBaseElem extends DistParentElem {
 			// initialize current object
 			try {
 				NodeIterator ni = getDistVersions();
-				while (ni.hasNext()) {
+				while (ni != null && ni.hasNext()) {
 					Node curNode = ni.nextNode();
 					addChild(new ModularDistVersionElem(this, curNode
 							.getProperty(SlcNames.SLC_ARTIFACT_VERSION)
@@ -74,6 +75,9 @@ public class ModularDistBaseElem extends DistParentElem {
 
 	public NodeIterator getDistVersions() {
 		try {
+			if (AETHER_CATEGORY_BASE.equals(type))
+				return null;
+
 			QueryManager queryManager = artifactBase.getSession()
 					.getWorkspace().getQueryManager();
 			QueryObjectModelFactory factory = queryManager.getQOMFactory();