Author: oheger
Date: Thu Apr 4 19:41:16 2013
New Revision: 1464699
URL: http://svn.apache.org/r1464699
Log:
PropertiesConfigurationLayout no longer reacts on RELOAD events.
Because PropertiesConfiguration no longer extends AbstractFileConfiguration
such events will never be fired.
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/PropertiesConfigurationLayout.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestPropertiesConfigurationLayout.java
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/PropertiesConfigurationLayout.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/PropertiesConfigurationLayout.java?rev=1464699&r1=1464698&r2=1464699&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/PropertiesConfigurationLayout.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/PropertiesConfigurationLayout.java
Thu Apr 4 19:41:16 2013
@@ -608,15 +608,7 @@ public class PropertiesConfigurationLayo
*/
public void configurationChanged(ConfigurationEvent event)
{
- if (event.isBeforeUpdate())
- {
- if (AbstractFileConfiguration.EVENT_RELOAD == event.getType())
- {
- clear();
- }
- }
-
- else
+ if (!event.isBeforeUpdate())
{
switch (event.getType())
{
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestPropertiesConfigurationLayout.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestPropertiesConfigurationLayout.java?rev=1464699&r1=1464698&r2=1464699&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestPropertiesConfigurationLayout.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestPropertiesConfigurationLayout.java
Thu Apr 4 19:41:16 2013
@@ -18,7 +18,6 @@ package org.apache.commons.configuration
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
@@ -371,35 +370,6 @@ public class TestPropertiesConfiguration
}
/**
- * Tests if a reload update is correctly processed.
- */
- @Test
- public void testEventReload()
- {
- fillLayout();
- ConfigurationEvent event = new ConfigurationEvent(this,
- AbstractFileConfiguration.EVENT_RELOAD, null, null, true);
- layout.configurationChanged(event);
- assertTrue("Keys not empty", layout.getKeys().isEmpty());
- assertNull("Header comment was not reset", layout.getHeaderComment());
- }
-
- /**
- * Tests the event after a reload has been performed. This should be
- * ignored.
- */
- @Test
- public void testEventReloadAfter()
- {
- fillLayout();
- ConfigurationEvent event = new ConfigurationEvent(this,
- AbstractFileConfiguration.EVENT_RELOAD, null, null, false);
- layout.configurationChanged(event);
- assertFalse("Keys are empty", layout.getKeys().isEmpty());
- assertNotNull("Header comment was reset", layout.getHeaderComment());
- }
-
- /**
* Tests a recursive load call.
*/
@Test
