From 887a0e1b594da18d53cca73a1e6e1b38923990e8 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Thu, 18 Feb 2016 16:08:33 +0000
Subject: [PATCH] SSDM-3071: Bug fixed by trimming the lines.
SVN: 35709
---
.../ch/systemsx/cisd/common/io/PropertyIOUtils.java | 2 +-
.../systemsx/cisd/common/io/PropertyIOUtilsTest.java | 11 +++++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/common/source/java/ch/systemsx/cisd/common/io/PropertyIOUtils.java b/common/source/java/ch/systemsx/cisd/common/io/PropertyIOUtils.java
index 19af7e179b4..62a3a622089 100644
--- a/common/source/java/ch/systemsx/cisd/common/io/PropertyIOUtils.java
+++ b/common/source/java/ch/systemsx/cisd/common/io/PropertyIOUtils.java
@@ -52,7 +52,7 @@ public class PropertyIOUtils
List<String> lines = FileUtilities.loadToStringList(propertiesFile);
for (int i = 0; i < lines.size(); i++)
{
- String line = lines.get(i);
+ String line = lines.get(i).trim();
if (line.length() == 0 || line.startsWith("#"))
{
continue;
diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/io/PropertyIOUtilsTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/io/PropertyIOUtilsTest.java
index 38d4067391d..8bf6ebb6e23 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/io/PropertyIOUtilsTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/io/PropertyIOUtilsTest.java
@@ -60,5 +60,16 @@ public class PropertyIOUtilsTest extends AbstractFileSystemTestCase
+ "': question", ex.getMessage());
}
}
+
+ @Test
+ public void testLoadPropertiesWithEmptyLineWithASpace()
+ {
+ File propertiesFile = new File(workingDirectory, "p.properties");
+ FileUtilities.writeToFile(propertiesFile, " answer = 42 \n \n");
+
+ Properties properties = PropertyIOUtils.loadProperties(propertiesFile);
+
+ assertEquals("42", properties.getProperty("answer"));
+ }
}
--
GitLab