You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/02/27 12:42:40 UTC
svn commit: r381323 - in
/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring:
ComponentInfo.java XmlConfigCreator.java
Author: cziegeler
Date: Mon Feb 27 03:42:22 2006
New Revision: 381323
URL: http://svn.apache.org/viewcvs?rev=381323&view=rev
Log:
Fix component life style handling
Modified:
cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/ComponentInfo.java
cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/XmlConfigCreator.java
Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/ComponentInfo.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/ComponentInfo.java?rev=381323&r1=381322&r2=381323&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/ComponentInfo.java (original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/ComponentInfo.java Mon Feb 27 03:42:22 2006
@@ -94,7 +94,7 @@
* Create a new info.
*/
public ComponentInfo() {
- this.model = MODEL_PRIMITIVE;
+ this.model = MODEL_UNKNOWN;
}
/**
Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/XmlConfigCreator.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/XmlConfigCreator.java?rev=381323&r1=381322&r2=381323&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/XmlConfigCreator.java (original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/XmlConfigCreator.java Mon Feb 27 03:42:22 2006
@@ -99,6 +99,8 @@
current.setModel(ComponentInfo.MODEL_SINGLETON);
} else if ( Poolable.class.isAssignableFrom(serviceClass) ) {
current.setModel(ComponentInfo.MODEL_POOLED);
+ } else {
+ current.setModel(ComponentInfo.MODEL_PRIMITIVE);
}
}
if ( current.getModel() == ComponentInfo.MODEL_POOLED ) {