stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8268222: javax/xml/jaxp/unittest/transform/Bug6216226Test.java failed, cannot delete file

Browse Source 
Reviewed-by: dfuchs
This commit is contained in:
Joe Wang 2021-06-04 16:31:59 +00:00
parent 59a539fef1
commit b27599b3ec
2 changed files with 13 additions and 35 deletions
src/java.xml/share/classes
com/sun/org/apache/xalan/internal/xsltc/trax
TransformerImpl.java
javax/xml/transform/stream
StreamResult.java

36
src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java

@ -48,6 +48,8 @@ import java.net.URI;
import java.net.URL;
import java.net.URLConnection;
import java.net.UnknownServiceException;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashMap;
@ -99,7 +101,7 @@ import org.xml.sax.ext.LexicalHandler;
* @author Morten Jorgensen
* @author G. Todd Miller
* @author Santiago Pericas-Geertsen
* @LastModified: May 2021
* @LastModified: June 2021
*/
public final class TransformerImpl extends Transformer
implements DOMCache
@ -510,35 +512,15 @@ public final class TransformerImpl extends Transformer
// or (3) just a filename on the local system.
URL url;
if (systemId.startsWith("file:")) {
// if StreamResult(File) or setSystemID(File) was used,
// the systemId will be URI encoded as a result of File.toURI(),
// it must be decoded for use by URL
try{
URI uri = new URI(systemId) ;
systemId = "file:";
String host = uri.getHost(); // decoded String
String path = uri.getPath(); //decoded String
if (path == null) {
path = "";
}
// if host (URI authority) then file:// + host + path
// else just path (may be absolute or relative)
if (host != null) {
systemId += "//" + host + path;
} else {
systemId += "//" + path;
}
Path p = Paths.get(new URI(systemId));
_ostream = new FileOutputStream(p.toFile());
_tohFactory.setOutputStream(_ostream);
return _tohFactory.getSerializationHandler();
}
catch (Exception exception) {
// URI exception which means nothing can be done so OK to ignore
catch (Exception e) {
throw new TransformerException(e);
}
url = new URL(systemId);
_ostream = new FileOutputStream(url.getFile());
_tohFactory.setOutputStream(_ostream);
return _tohFactory.getSerializationHandler();
}
else if (systemId.startsWith("http:")) {
url = new URL(systemId);

12
src/java.xml/share/classes/javax/xml/transform/stream/StreamResult.java

@ -28,8 +28,6 @@ package javax.xml.transform.stream;
import javax.xml.transform.Result;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.OutputStream;
import java.io.Writer;
@ -96,12 +94,10 @@ public class StreamResult implements Result {
* @param f Must a non-null File reference.
*/
public StreamResult(File f) {
try {
outputStream = new FileOutputStream(f);
} catch (FileNotFoundException ex) {
// fall back to the original implementation for compatibility
setSystemId(f.toURI().toASCIIString());
}
//convert file to appropriate URI, f.toURI().toASCIIString()
//converts the URI to string as per rule specified in
//RFC 2396,
setSystemId(f.toURI().toASCIIString());
}
/**