mcconnell 2003/10/19 01:30:28
Modified: meta/api/src/java/org/apache/avalon/meta/info
InfoDescriptor.java
Log:
Make the default collection policy CONSERVATIVE to ensure implicit compatability.
Revision Changes Path
1.5 +3 -12
avalon/meta/api/src/java/org/apache/avalon/meta/info/InfoDescriptor.java
Index: InfoDescriptor.java
===================================================================
RCS file:
/home/cvs/avalon/meta/api/src/java/org/apache/avalon/meta/info/InfoDescriptor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InfoDescriptor.java 19 Oct 2003 06:09:32 -0000 1.4
+++ InfoDescriptor.java 19 Oct 2003 08:30:28 -0000 1.5
@@ -133,8 +133,7 @@
* does not occur. A component implementing CONSERVATIVE policies will be
* maintained irrespective of usage and memory constraints so long as its
* scope exists (the jvm for a "singleton" and Thread for "thread" lifestyles).
- * The default policy is DEMOCRAT for singleton and per thread componet.
- * Transient and poooled components default to LIBERAL.
+ * The default policy is CONSERVATIVE.
*/
private final String m_collection;
@@ -222,15 +221,7 @@
if ( collection == null )
{
- final String policy = getLifestyle();
- if( policy.equals( TRANSIENT ) || policy.equals( POOLED ))
- {
- m_collection = LIBERAL;
- }
- else
- {
- m_collection = DEMOCRAT;
- }
+ m_collection = CONSERVATIVE;
}
else
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
