From d6559fd4bcaafc97cde068c44bbaf864fd811742 Mon Sep 17 00:00:00 2001 From: Peter Dietz Date: Wed, 27 Oct 2010 03:46:42 +0000 Subject: [PATCH] Fixing change caused by r5665, which dropped getProperty with default. git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@5668 9c30dcfa-912a-0410-8fc2-9e0234be79fd --- .../src/main/java/org/dspace/content/Bundle.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dspace-api/src/main/java/org/dspace/content/Bundle.java b/dspace-api/src/main/java/org/dspace/content/Bundle.java index 52999c7f02..c6f115620c 100644 --- a/dspace-api/src/main/java/org/dspace/content/Bundle.java +++ b/dspace-api/src/main/java/org/dspace/content/Bundle.java @@ -103,8 +103,18 @@ public class Bundle extends DSpaceObject ourContext = context; bundleRow = row; bitstreams = new ArrayList(); - String bitstreamOrderingField = ConfigurationManager.getProperty("webui.bitstream.order.field", "sequence_id"); - String bitstreamOrderingDirection = ConfigurationManager.getProperty("webui.bitstream.order.direction", "ASC"); + String bitstreamOrderingField = ConfigurationManager.getProperty("webui.bitstream.order.field"); + String bitstreamOrderingDirection = ConfigurationManager.getProperty("webui.bitstream.order.direction"); + + if (bitstreamOrderingField == null) + { + bitstreamOrderingField = "sequence_id"; + } + + if (bitstreamOrderingDirection == null) + { + bitstreamOrderingDirection = "ASC"; + } StringBuilder query = new StringBuilder(); query.append("SELECT bitstream.* FROM bitstream, bundle2bitstream WHERE");