vgritsenko 02/01/17 12:14:32
Modified: src/java/org/apache/cocoon/transformation
TraxTransformer.java
Log:
- Release Deli on destroy()
- Log if Deli was requested and is not available
Revision Changes Path
1.5 +20 -9
xml-cocoon2/src/java/org/apache/cocoon/transformation/TraxTransformer.java
Index: TraxTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/TraxTransformer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TraxTransformer.java 14 Jan 2002 15:23:40 -0000 1.4
+++ TraxTransformer.java 17 Jan 2002 20:14:32 -0000 1.5
@@ -113,7 +113,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Ovidiu Predescu</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Mark H. Butler</a>
- * @version CVS $Id: TraxTransformer.java,v 1.4 2002/01/14 15:23:40 cziegeler Exp $
+ * @version CVS $Id: TraxTransformer.java,v 1.5 2002/01/17 20:14:32 vgritsenko Exp $
*/
public class TraxTransformer extends AbstractTransformer
implements Transformer, Composable, Recyclable, Configurable, Cacheable, Disposable
{
@@ -214,15 +214,19 @@
*/
public void compose(ComponentManager manager) throws ComponentException {
this.manager = manager;
- if (this.getLogger().isDebugEnabled() == true) {
+
+ if (this.getLogger().isDebugEnabled()) {
getLogger().debug("Looking up " + Browser.ROLE);
}
this.browser = (Browser) manager.lookup(Browser.ROLE);
- getLogger().debug("Looking up " + Deli.ROLE);
- if (this.manager.hasComponent(Deli.ROLE))
- {
+ if (this.manager.hasComponent(Deli.ROLE)) {
+ if (this.getLogger().isDebugEnabled()) {
+ getLogger().debug("Looking up " + Deli.ROLE);
+ }
this.deli = (Deli) manager.lookup(Deli.ROLE);
+ } else {
+ getLogger().debug("Deli is not available");
}
}
@@ -407,6 +411,7 @@
if (map == null) {
map = new HashMap();
}
+
/* Get the accept header; it's needed to get the browser type. */
String accept = request.getParameter("accept");
if (accept == null)
@@ -445,22 +450,26 @@
map = new HashMap();
}
- if (request != null) {
- org.w3c.dom.Document deliCapabilities =
deli.getUACapabilities(request);
+ if (this.deli != null) {
+ org.w3c.dom.Document deliCapabilities =
this.deli.getUACapabilities(request);
map.put("deli-capabilities", deliCapabilities);
-
+
String accept = request.getParameter("accept");
if (accept == null)
accept = request.getHeader("accept");
-
+
/* add the accept param */
map.put("accept", accept);
+ } else {
+ // FIXME (VG): Is this an error condition?
+ getLogger().warn("Deli is not available! Capabilities are not
set.");
}
} catch (Exception e) {
getLogger().error("Error setting DELI info", e);
}
}
+
return map;
}
@@ -494,6 +503,8 @@
this.manager.release((Component)this.browser);
if(this.xsltProcessor != null)
this.manager.release((Component)this.xsltProcessor);
+ if(this.deli != null)
+ this.manager.release((Component)this.deli);
}
public void recycle()
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
