From 8c288c15c28d5d387008611dea19353631d3ab8f Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 13 Apr 2011 12:26:04 +0000
Subject: [PATCH] bug in comparator fixed, sorting removed in
DefaultFileBasedHierarchicalContentNode
SVN: 20881
---
.../cisd/common/io/DefaultFileBasedHierarchicalContentNode.java | 2 --
.../cisd/openbis/dss/generic/server/DatasetDownloadServlet.java | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/common/source/java/ch/systemsx/cisd/common/io/DefaultFileBasedHierarchicalContentNode.java b/common/source/java/ch/systemsx/cisd/common/io/DefaultFileBasedHierarchicalContentNode.java
index a2ef4a23af4..1a9cecaa17b 100644
--- a/common/source/java/ch/systemsx/cisd/common/io/DefaultFileBasedHierarchicalContentNode.java
+++ b/common/source/java/ch/systemsx/cisd/common/io/DefaultFileBasedHierarchicalContentNode.java
@@ -21,7 +21,6 @@ import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.InputStream;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
@@ -83,7 +82,6 @@ class DefaultFileBasedHierarchicalContentNode extends AbstractHierarchicalConten
public List<IHierarchicalContentNode> doGetChildNodes()
{
File[] files = file.listFiles();
- Arrays.sort(files);
List<IHierarchicalContentNode> result = new ArrayList<IHierarchicalContentNode>();
if (files != null)
{
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServlet.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServlet.java
index 27f04f56603..f19a3b18005 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServlet.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServlet.java
@@ -86,7 +86,7 @@ public class DatasetDownloadServlet extends AbstractDatasetDownloadServlet
public int compare(IHierarchicalContentNode node1,
IHierarchicalContentNode node2)
{
- return createSortableName(node1).compareTo(createSortableName(node1));
+ return createSortableName(node1).compareTo(createSortableName(node2));
}
private String createSortableName(IHierarchicalContentNode node)
--
GitLab