fix up children

fcrepo · May 10, 2013 · abbcfd0 · abbcfd0
1 parent 7258a21
commit abbcfd0
Showing 1 changed file with 18 additions and 13 deletions.
diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraChildren.java b/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraChildren.java
@@ -23,6 +23,7 @@
 import org.fcrepo.AbstractResource;
 import org.fcrepo.services.ObjectService;
 import org.fcrepo.utils.FedoraJcrTypes;
+import org.modeshape.jcr.api.JcrConstants;
 import org.slf4j.Logger;
 import org.springframework.stereotype.Component;
 
@@ -62,19 +63,23 @@ public Response getObjects(
 			final String path = toPath(pathList);
 			logger.info("getting children of {}", path);
 
-            switch (limitByMixinValue) {
-                case "":
-                    mixin = null;
-                    break;
-                case FedoraJcrTypes.FEDORA_OBJECT:
-                    mixin = "nt:folder";
-                    break;
-                case FedoraJcrTypes.FEDORA_DATASTREAM:
-                    mixin = "nt:file";
-                    break;
-                default:
-                    mixin = limitByMixinValue;
-                    break;
+            if (limitByMixinValue != null) {
+                switch (limitByMixinValue) {
+                    case "":
+                        mixin = null;
+                        break;
+                    case FedoraJcrTypes.FEDORA_OBJECT:
+                        mixin = JcrConstants.NT_FOLDER;
+                        break;
+                    case FedoraJcrTypes.FEDORA_DATASTREAM:
+                        mixin = JcrConstants.NT_FILE;
+                        break;
+                    default:
+                        mixin = limitByMixinValue;
+                        break;
+                }
+            } else {
+                mixin = null;
             }
 
 			return ok(nodeService.getObjectNames(session, path, mixin).toString()).build();