Attachment #34078 for bug #59859

View | Details | Raw Unified | Return to bug 59859
Collapse All | Expand All

Lines 20-25 defaultServlet.missingResource=The requested resource ({0}) is not available Link Here

(-)a/java/org/apache/catalina/servlets/LocalStrings.properties (+1 lines)
20	defaultservlet.skipfail=Only skipped [{0}] bytes when [{1}] were requested	20	defaultservlet.skipfail=Only skipped [{0}] bytes when [{1}] were requested
21	webdavservlet.jaxpfailed=JAXP initialization failed	21	webdavservlet.jaxpfailed=JAXP initialization failed
22	webdavservlet.enternalEntityIgnored=The request included a reference to an external entity with PublicID {0} and SystemID {1} which was ignored	22	webdavservlet.enternalEntityIgnored=The request included a reference to an external entity with PublicID {0} and SystemID {1} which was ignored
		23	webdavservlet.inputstreamclosefail=Failed to close the inputStream of [{0}]
23	directory.filename=Filename	24	directory.filename=Filename
24	directory.lastModified=Last Modified	25	directory.lastModified=Last Modified
25	directory.parent=Up To {0}	26	directory.parent=Up To {0}




package org.apache.catalina.servlets;

import java.io.IOException;
import java.io.InputStream;
import java.io.StringReader;
import java.io.StringWriter;
import java.io.Writer;

                    }
                }
            }
            try (InputStream is = sourceResource.getInputStream()) {
                if (!resources.write(dest, is,
                        false)) {
                    errorList.put(source,
                            Integer.valueOf(WebdavStatus.SC_INTERNAL_SERVER_ERROR));
                    return false;
                }
            } catch (IOException e) {
                log(sm.getString("webdavservlet.inputstreamclosefail", source), e);
            }
        } else {
            errorList.put(source,

Return to bug 59859

Lines 17-22 Link Here

(-)a/java/org/apache/catalina/servlets/WebdavServlet.java (-5 / +10 lines)
17	package org.apache.catalina.servlets;	17	package org.apache.catalina.servlets;
18		18
19	import java.io.IOException;	19	import java.io.IOException;
		20	import java.io.InputStream;
20	import java.io.StringReader;	21	import java.io.StringReader;
21	import java.io.StringWriter;	22	import java.io.StringWriter;
22	import java.io.Writer;	23	import java.io.Writer;
Lines 1709-1719 public class WebdavServlet Link Here
1709	}	1710	}
1710	}	1711	}
1711	}	1712	}
1712	if (!resources.write(dest, sourceResource.getInputStream(),	1713	try (InputStream is = sourceResource.getInputStream()) {
1713	false)) {	1714	if (!resources.write(dest, is,
1714	errorList.put(source,	1715	false)) {
1715	Integer.valueOf(WebdavStatus.SC_INTERNAL_SERVER_ERROR));	1716	errorList.put(source,
1716	return false;	1717	Integer.valueOf(WebdavStatus.SC_INTERNAL_SERVER_ERROR));
		1718	return false;
		1719	}
		1720	} catch (IOException e) {
		1721	log(sm.getString("webdavservlet.inputstreamclosefail", source), e);
1717	}	1722	}
1718	} else {	1723	} else {
1719	errorList.put(source,	1724	errorList.put(source,