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:05 UTC
svn commit: r369914 - in /geronimo/branches/1.0/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:53:57 2006
New Revision: 369914
URL: http://svn.apache.org/viewcvs?rev=369914&view=rev
Log:
GERONIMO-1455 decouple config list and attribute manager functionality that were coupled by mistake
Modified:
geronimo/branches/1.0/modules/system/src/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java
geronimo/branches/1.0/modules/system/src/test/org/apache/geronimo/system/configuration/LocalAttributeManagerTest.java
Modified: geronimo/branches/1.0/modules/system/src/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/system/src/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java?rev=369914&r1=369913&r2=369914&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/system/src/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java (original)
+++ geronimo/branches/1.0/modules/system/src/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java Tue Jan 17 12:53:57 2006
@@ -104,9 +104,6 @@
if (configuration == null) {
return gbeanDatas;
}
- if (!configuration.isLoad()) {
- return Collections.EMPTY_LIST;
- }
// index the incoming datas
Map datasByName = new HashMap();
Modified: geronimo/branches/1.0/modules/system/src/test/org/apache/geronimo/system/configuration/LocalAttributeManagerTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/system/src/test/org/apache/geronimo/system/configuration/LocalAttributeManagerTest.java?rev=369914&r1=369913&r2=369914&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/system/src/test/org/apache/geronimo/system/configuration/LocalAttributeManagerTest.java (original)
+++ geronimo/branches/1.0/modules/system/src/test/org/apache/geronimo/system/configuration/LocalAttributeManagerTest.java Tue Jan 17 12:53:57 2006
@@ -67,12 +67,6 @@
assertEquals(1, newDatas.size());
assertEquals(originalDatas, newDatas);
- // remove the configuration from the store
- localAttributeManager.removeConfiguration(configurationName.toString());
-
- // should not load
- newDatas = new HashSet(localAttributeManager.setAttributes(configurationName, originalDatas, getClass().getClassLoader()));
- assertEquals(0, newDatas.size());
}
public void testGBeanShouldLoad() throws Exception {