vgritsenko 2003/12/10 07:55:08
Modified: src/java/org/apache/cocoon/components/source/impl
SitemapSource.java
Log:
some cleanup
Revision Changes Path
1.15 +11 -12
cocoon-2.1/src/java/org/apache/cocoon/components/source/impl/SitemapSource.java
Index: SitemapSource.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/source/impl/SitemapSource.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- SitemapSource.java 29 Oct 2003 14:45:53 -0000 1.14
+++ SitemapSource.java 10 Dec 2003 15:55:08 -0000 1.15
@@ -284,7 +284,7 @@
* Return an <code>InputStream</code> object to read from the source.
*/
public InputStream getInputStream()
- throws IOException, SourceException {
+ throws IOException, SourceException {
if (this.needsRefresh) {
this.refresh();
@@ -305,7 +305,6 @@
this.manager,
this.pipelineProcessor);
try {
-
this.processingPipeline.process(this.environment);
} finally {
CocoonComponentManager.leaveEnvironment();
@@ -368,8 +367,8 @@
* and content length.
*/
public void refresh() {
- this.reset();
- this.init();
+ reset();
+ init();
}
/**
@@ -437,7 +436,7 @@
throws SAXException
{
if (this.needsRefresh) {
- this.refresh();
+ refresh();
}
if (this.exception != null) {
throw this.exception;
@@ -481,7 +480,9 @@
* Reset everything
*/
private void reset() {
- if (this.processingPipeline != null)
this.processingPipeline.release();
+ if (this.processingPipeline != null) {
+ this.processingPipeline.release();
+ }
if (this.processKey != null) {
CocoonComponentManager.endProcessing(this.environment,
this.processKey);
this.processKey = null;
@@ -503,9 +504,9 @@
* Recyclable
*/
public void recycle() {
- this.reset();
- if ( this.sourceResolver != null ) {
- this.manager.release( this.sourceResolver );
+ reset();
+ if (this.sourceResolver != null) {
+ this.manager.release(this.sourceResolver);
}
}
@@ -535,6 +536,4 @@
public Iterator getParameterNames() {
return java.util.Collections.EMPTY_LIST.iterator();
}
-
-
}
