bootloader: remove trailing white spaces when parsing layout file.

Ticket: #7100 Acked-by: Tatjana Baranova Patch: https://rb.dcache.org/r/4403/
dCache · May 7, 2012 · 538bc1a · 538bc1a
1 parent ed01d63
commit 538bc1a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/modules/dcache/src/main/java/org/dcache/util/ConfigurationProperties.java b/modules/dcache/src/main/java/org/dcache/util/ConfigurationProperties.java
@@ -260,7 +260,7 @@ public synchronized Object put(Object rawKey, Object value)
             store(key);
         }
 
-        return key.hasAnyOf(OBSOLETE_FORBIDDEN) ? null : super.put(name, value);
+        return key.hasAnyOf(OBSOLETE_FORBIDDEN) ? null : super.put(name, ((String)value).trim());
     }
 
 

diff --git a/modules/dcache/src/test/java/org/dcache/boot/LayoutTests.java b/modules/dcache/src/test/java/org/dcache/boot/LayoutTests.java
@@ -56,6 +56,23 @@ public void testLoadSingleDomainWithProperty() throws IOException {
         assertDomainHasProperty( domain, propertyName, propertyValue);
     }
 
+    @Test
+    public void testLoadSingleDomainWithWhiteSpaceProperty() throws IOException {
+        String domainName = "domainName";
+        String propertyName = "foo";
+        String propertyValue = "bar ";
+
+        _readerSource.appendDomain(domainName);
+        _readerSource.addProperty(propertyName, propertyValue);
+
+        load();
+
+        Domain domain = _layout.getDomain(domainName);
+        assertNotNull(domain);
+        assertDomainHasProperty(domain, PROPERTY_DOMAIN_NAME_KEY, domainName);
+        assertDomainHasProperty(domain, propertyName, propertyValue.trim());
+    }
+
     @Test
     public void testLoadSingleDomainWithGlobalProperty() throws IOException {
         String domainName = "domainName";