You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2006/01/17 21:54:28 UTC
svn commit: r369915 - in /geronimo/trunk/modules/system/src:
java/org/apache/geronimo/system/configuration/LocalAttributeManager.java
test/org/apache/geronimo/system/configuration/LocalAttributeManagerTest.java
Author: djencks
Date: Tue Jan 17 12:54:26 2006
New Revision: 369915
URL: http://svn.apache.org/viewcvs?rev=369915&view=rev
Log:
GERONIMO-1455 clean up previous fix
Modified:
geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java
geronimo/trunk/modules/system/src/test/org/apache/geronimo/system/configuration/LocalAttributeManagerTest.java
Modified: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java?rev=369915&r1=369914&r2=369915&view=diff
==============================================================================
--- geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java (original)
+++ geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java Tue Jan 17 12:54:26 2006
@@ -104,11 +104,6 @@
if (configuration == null) {
return gbeanDatas;
}
-// IMO (DJ) the following lines mix the config.list and config.xml functionalities for no reason.
-// They also cause GERONIMO-1455
-// if (!configuration.isLoad()) {
-// return Collections.EMPTY_LIST;
-// }
// index the incoming datas
Map datasByName = new HashMap();
Modified: geronimo/trunk/modules/system/src/test/org/apache/geronimo/system/configuration/LocalAttributeManagerTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/system/src/test/org/apache/geronimo/system/configuration/LocalAttributeManagerTest.java?rev=369915&r1=369914&r2=369915&view=diff
==============================================================================
--- geronimo/trunk/modules/system/src/test/org/apache/geronimo/system/configuration/LocalAttributeManagerTest.java (original)
+++ geronimo/trunk/modules/system/src/test/org/apache/geronimo/system/configuration/LocalAttributeManagerTest.java Tue Jan 17 12:54:26 2006
@@ -67,13 +67,6 @@
assertEquals(1, newDatas.size());
assertEquals(originalDatas, newDatas);
- // remove the configuration from the store
- localAttributeManager.removeConfiguration(configurationName.toString());
-
- // should not load
-// The next lines mix the "load" question with the "what attributes are overridden" question. Please answer them separately.
-// newDatas = new HashSet(localAttributeManager.setAttributes(configurationName, originalDatas, getClass().getClassLoader()));
-// assertEquals(0, newDatas.size());
}
public void testGBeanShouldLoad() throws Exception {