Author: fanningpj
Date: Fri Oct 20 16:41:03 2023
New Revision: 1913147
URL: http://svn.apache.org/viewvc?rev=1913147&view=rev
Log:
try to fix issue in Diff
Modified:
xmlbeans/trunk/build.gradle
xmlbeans/trunk/src/test/java/org/apache/xmlbeans/impl/tool/Diff.java
Modified: xmlbeans/trunk/build.gradle
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/build.gradle?rev=1913147&r1=1913146&r2=1913147&view=diff
==============================================================================
--- xmlbeans/trunk/build.gradle (original)
+++ xmlbeans/trunk/build.gradle Fri Oct 20 16:41:03 2023
@@ -79,7 +79,7 @@ def testSchemas = [
[dir:'src/test/resources/xbean',path:'dom',name:'sDOM'],
[dir:'src/test/resources/xbean',path:'xmlcursor',name:'sXMLCURSOR'],
[dir:'src/test/resources/xbean',path:'scomp',name:'sSCOMP'],
- [dir:'src/test/resources/xbean',path:'simple',name:'sSIMPLE'],
+ //[dir:'src/test/resources/xbean',path:'simple',name:'sSIMPLE'],
[dir:'src/test/resources/xbean',path:'ValidatingStream',name:'sVALIDATE'],
[dir:'src/test/resources/xbean',path:'usertype',name:'sUSERTYPE'],
[dir:'build/schemas/sTRANXML',path:'tranxml',name:'sTRANXML'],
Modified: xmlbeans/trunk/src/test/java/org/apache/xmlbeans/impl/tool/Diff.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/apache/xmlbeans/impl/tool/Diff.java?rev=1913147&r1=1913146&r2=1913147&view=diff
==============================================================================
--- xmlbeans/trunk/src/test/java/org/apache/xmlbeans/impl/tool/Diff.java
(original)
+++ xmlbeans/trunk/src/test/java/org/apache/xmlbeans/impl/tool/Diff.java Fri
Oct 20 16:41:03 2023
@@ -21,7 +21,6 @@ import org.apache.xmlbeans.impl.schema.S
import java.io.*;
import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
import java.util.*;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
@@ -252,8 +251,8 @@ public class Diff {
public static void filesAsXsb(File file1, File file2, List<XmlError>
diffs) {
assert file1.exists() : "File \"" + file1.getAbsolutePath() + "\" does
not exist.";
assert file2.exists() : "File \"" + file2.getAbsolutePath() + "\" does
not exist.";
- try (InputStream stream1 = Files.newInputStream(file1.toPath());
- InputStream stream2 = Files.newInputStream(file2.toPath())) {
+ try (InputStream stream1 = new FileInputStream(file1);
+ InputStream stream2 = new FileInputStream(file2)) {
streamsAsXsb(stream1, file1.getName(), stream2, file2.getName(),
diffs);
} catch (IOException ignored) {
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
