[Yanel-commits] rev 37542 -
public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet
michi at wyona.com
michi at wyona.com
Mon Jul 14 11:43:47 CEST 2008
Author: michi
Date: 2008-07-14 11:43:46 +0200 (Mon, 14 Jul 2008)
New Revision: 37542
Modified:
public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
Log:
more input streams closed and simplified
Modified: public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
===================================================================
--- public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java 2008-07-14 09:21:52 UTC (rev 37541)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java 2008-07-14 09:43:46 UTC (rev 37542)
@@ -1909,9 +1909,9 @@
}
SourceResolver resolver = new SourceResolver(resourceOfPrefix);
Source source = resolver.resolve(htdocsPath, null);
- InputStream htodoc = ((StreamSource) source).getInputStream();
+ InputStream htdocIn = ((StreamSource) source).getInputStream();
- if (htodoc != null) {
+ if (htdocIn != null) {
log.debug("Resource-Type specific data: " + htdocsPath);
// TODO: Set HTTP header (mime-type, size, etc.)
String mimeType = guessMimeType(FilenameUtils.getExtension(FilenameUtils.getName(htdocsPath)));
@@ -1919,11 +1919,11 @@
byte buffer[] = new byte[8192];
int bytesRead;
- InputStream in = htodoc;
OutputStream out = response.getOutputStream();
- while ((bytesRead = in.read(buffer)) != -1) {
+ while ((bytesRead = htdocIn.read(buffer)) != -1) {
out.write(buffer, 0, bytesRead);
}
+ htdocIn.close();
// allow client-side caching:
if (cacheExpires != 0) {
setExpiresHeader(response, cacheExpires);
@@ -1953,6 +1953,7 @@
while ((bytesRead = in.read(buffer)) != -1) {
out.write(buffer, 0, bytesRead);
}
+ in.close();
// allow client-side caching:
if (cacheExpires != 0) {
setExpiresHeader(response, cacheExpires);
More information about the Yanel-commits
mailing list