You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2007/12/19 16:27:16 UTC
svn commit: r605579 -
/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/StreamGenerator.java
Author: vgritsenko
Date: Wed Dec 19 07:27:16 2007
New Revision: 605579
URL: http://svn.apache.org/viewvc?rev=605579&view=rev
Log:
more cleanup
Modified:
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/StreamGenerator.java
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/StreamGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/StreamGenerator.java?rev=605579&r1=605578&r2=605579&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/StreamGenerator.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/StreamGenerator.java Wed Dec 19 07:27:16 2007
@@ -16,6 +16,15 @@
*/
package org.apache.cocoon.generation;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.StringReader;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.excalibur.xml.sax.SAXParser;
+
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.environment.ObjectModelHelper;
@@ -23,17 +32,10 @@
import org.apache.cocoon.environment.http.HttpEnvironment;
import org.apache.cocoon.servlet.multipart.Part;
import org.apache.cocoon.util.PostInputStream;
-import org.apache.excalibur.xml.sax.SAXParser;
+
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import javax.servlet.http.HttpServletRequest;
-
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.StringReader;
-
/**
* The <code>StreamGenerator</code> is a class that reads XML from a request
* InputStream and generates SAX Events.
@@ -70,18 +72,6 @@
/** The parameter holding the name associated with the xml data **/
public static final String FORM_NAME = "form-name";
- /** The input source */
- private InputSource inputSource;
-
- /**
- * Recycle this component.
- * All instance variables are set to <code>null</code>.
- */
- public void recycle() {
- this.inputSource = null;
- super.recycle();
- }
-
/**
* Generate XML data out of request InputStream.
*/
@@ -104,6 +94,7 @@
}
}
+ InputSource source;
if (contentType.startsWith("application/x-www-form-urlencoded") ||
contentType.startsWith("multipart/form-data")) {
String parameter = parameters.getParameter(FORM_NAME, null);
@@ -123,7 +114,7 @@
parameter + " : " + xmlObject);
}
- this.inputSource = new InputSource(xmlReader);
+ source = new InputSource(xmlReader);
} else if (contentType.startsWith("text/plain") ||
contentType.startsWith("text/xml") ||
contentType.startsWith("application/xhtml+xml") ||
@@ -139,7 +130,7 @@
}
PostInputStream anStream = new PostInputStream(httpRequest.getInputStream(), len);
- this.inputSource = new InputSource(anStream);
+ source = new InputSource(anStream);
} else {
throw new IOException("Unexpected getContentType(): " + request.getContentType());
}
@@ -149,18 +140,18 @@
}
String charset = getCharacterEncoding(request, contentType);
if (charset != null) {
- this.inputSource.setEncoding(charset);
+ source.setEncoding(charset);
}
parser = (SAXParser) this.manager.lookup(SAXParser.ROLE);
- parser.parse(this.inputSource, super.xmlConsumer);
+ parser.parse(source, super.xmlConsumer);
} catch (IOException e) {
getLogger().error("StreamGenerator.generate()", e);
throw new ResourceNotFoundException("StreamGenerator could not find resource", e);
} catch (SAXException e) {
getLogger().error("StreamGenerator.generate()", e);
throw(e);
- } catch (Exception e) {
+ } catch (ServiceException e) {
getLogger().error("Could not get parser", e);
throw new ProcessingException("Exception in StreamGenerator.generate()", e);
} finally {