Author: cziegeler Date: Wed Dec 15 07:19:25 2004 New Revision: 111973 URL: http://svn.apache.org/viewcvs?view=rev&rev=111973 Log: Clean up Modified: cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java
Modified: cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java?view=diff&rev=111973&p1=cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java&r1=111972&p2=cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java&r2=111973 ============================================================================== --- cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java (original) +++ cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java Wed Dec 15 07:19:25 2004 @@ -102,6 +102,11 @@ */ protected String link; + /** + * The default value for the envelope Tag + */ + protected String defaultEnvelopeTag; + /** * This tag will include the external XHMTL */ @@ -130,7 +135,7 @@ /** * The user agent identification string if confiugured */ - protected String userAgent = null; + protected String userAgent; /* (non-Javadoc) * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager) @@ -145,16 +150,11 @@ * @see org.apache.avalon.framework.parameters.Parameterizable#parameterize(Parameters) */ public void parameterize(Parameters parameters) { - if (parameters != null) { - envelopeTag = parameters.getParameter(ENVELOPE_TAG_PARAMETER, null); - String protocolHandler = - parameters.getParameter(PROTOCOL_HANDLER_PARAMETER, null); - if (protocolHandler != null) { - if (System.getProperty("java.protocol.handler.pkgs") == null) { - System.setProperty( - "java.protocol.handler.pkgs", - protocolHandler); - } + this.defaultEnvelopeTag = parameters.getParameter(ENVELOPE_TAG_PARAMETER, null); + String protocolHandler = parameters.getParameter(PROTOCOL_HANDLER_PARAMETER, null); + if (protocolHandler != null) { + if (System.getProperty("java.protocol.handler.pkgs") == null) { + System.setProperty("java.protocol.handler.pkgs", protocolHandler); } } } @@ -185,26 +185,30 @@ } if (documentBase == null) { - documentBase = this.link.substring(0, this.link.lastIndexOf('/') + 1); - copletInstanceData.setAttribute(DOCUMENT_BASE, documentBase); + this.documentBase = this.link.substring(0, this.link.lastIndexOf('/') + 1); + copletInstanceData.setAttribute(DOCUMENT_BASE, this.documentBase); } - String encodingString = (String)copletData.getAttribute("encoding"); - this.configuredEncoding = encodingConstantFromString(encodingString); + this.configuredEncoding = encodingConstantFromString((String)copletData.getAttribute("encoding")); this.userAgent = (String)copletData.getAttribute("user-agent"); - this.envelopeTag = parameters.getParameter("envelope-tag", envelopeTag); + this.envelopeTag = parameters.getParameter(ENVELOPE_TAG_PARAMETER, this.defaultEnvelopeTag); if (envelopeTag == null) { - throw new ProcessingException("Can not initialize RSFHtmlTransformer - sitemap parameter envelope-tag missing"); - } - - String protocolHandler = - parameters.getParameter(PROTOCOL_HANDLER_PARAMETER, null); - if (protocolHandler != null) { - System.setProperty("java.protocol.handler.pkgs", protocolHandler); + throw new ProcessingException("Can not initialize ProxyTransformer - sitemap parameter 'envelope-tag' missing"); } } + /* (non-Javadoc) + * @see org.apache.avalon.excalibur.pool.Recyclable#recycle() + */ + public void recycle() { + super.recycle(); + this.envelopeTag = null; + this.userAgent = null; + this.documentBase = null; + this.link = null; + } + /** * @see org.xml.sax.ContentHandler#startElement(String, String, String, Attributes) */
