vgritsenko 02/01/28 15:06:11
Modified: src/java/org/apache/cocoon/components/language/markup
AbstractMarkupLanguage.java
Log:
Resolve all logicsheet with the same resolver instance. Remove FIXME note.
Revision Changes Path
1.5 +7 -3
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java
Index: AbstractMarkupLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractMarkupLanguage.java 26 Jan 2002 17:13:33 -0000 1.4
+++ AbstractMarkupLanguage.java 28 Jan 2002 23:06:10 -0000 1.5
@@ -51,7 +51,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Ovidiu Predescu</a>
- * @version CVS $Revision: 1.4 $ $Date: 2002/01/26 17:13:33 $
+ * @version CVS $Revision: 1.5 $ $Date: 2002/01/28 23:06:10 $
*/
public abstract class AbstractMarkupLanguage extends AbstractLoggable
implements MarkupLanguage, Composable, Configurable, Recyclable
@@ -339,8 +339,12 @@
{
Logicsheet logicsheet = (Logicsheet)logicsheetCache.get(CACHE_PREFIX +
logicsheetLocation);
if (logicsheet == null) {
- Source inputSource = resolver.resolve(logicsheetLocation);
- // FIXME(VG): resolver (local) could not be used as it is temporary
+ // Logicsheet is reusable (across multiple XSPs) object,
+ // and it is resolved via urlResolver, and not via per-request
+ // temporary resolver.
+ Source inputSource = this.urlResolver.resolve(logicsheetLocation);
+
+ // Resolver (local) could not be used as it is temporary
// (per-request) object, yet Logicsheet is being cached and reused
// across multiple requests. "Global" url-factory-based resolver
// passed to the Logicsheet.
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
