Skip to content

Commit 9d96068

Browse files
committed
Fix nio failures on Windows
Signed-off-by: jansupol <jan.supol@oracle.com>
1 parent e3c3941 commit 9d96068

File tree

6 files changed

+12
-13
lines changed

6 files changed

+12
-13
lines changed

core-common/src/main/java/org/glassfish/jersey/SslConfigurator.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
package org.glassfish.jersey;
1818

1919
import java.io.ByteArrayInputStream;
20+
import java.io.File;
2021
import java.io.FileNotFoundException;
2122
import java.io.IOException;
2223
import java.io.InputStream;
2324
import java.nio.file.Files;
24-
import java.nio.file.Paths;
2525
import java.security.AccessController;
2626
import java.security.KeyManagementException;
2727
import java.security.KeyStore;
@@ -636,7 +636,7 @@ public SSLContext createSSLContext() {
636636
if (keyStoreBytes != null) {
637637
keyStoreInputStream = new ByteArrayInputStream(keyStoreBytes);
638638
} else if (!keyStoreFile.equals("NONE")) {
639-
keyStoreInputStream = Files.newInputStream(Paths.get(keyStoreFile));
639+
keyStoreInputStream = Files.newInputStream(new File(keyStoreFile).toPath());
640640
}
641641
_keyStore.load(keyStoreInputStream, keyStorePass);
642642
} finally {
@@ -711,7 +711,7 @@ public SSLContext createSSLContext() {
711711
if (trustStoreBytes != null) {
712712
trustStoreInputStream = new ByteArrayInputStream(trustStoreBytes);
713713
} else if (!trustStoreFile.equals("NONE")) {
714-
trustStoreInputStream = Files.newInputStream(Paths.get(trustStoreFile));
714+
trustStoreInputStream = Files.newInputStream(new File(trustStoreFile).toPath());
715715
}
716716
_trustStore.load(trustStoreInputStream, trustStorePass);
717717
} finally {

core-server/src/main/java/org/glassfish/jersey/server/internal/scanning/JarZipSchemeResourceFinderFactory.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616

1717
package org.glassfish.jersey.server.internal.scanning;
1818

19+
import java.io.File;
1920
import java.io.IOException;
2021
import java.io.InputStream;
2122
import java.net.MalformedURLException;
2223
import java.net.URI;
2324
import java.net.URL;
2425
import java.nio.file.Files;
25-
import java.nio.file.Paths;
2626
import java.util.Arrays;
2727
import java.util.Collections;
2828
import java.util.HashSet;
@@ -155,7 +155,7 @@ private InputStream getInputStream(final String jarUrlString) throws IOException
155155
return new URL(jarUrlString).openStream();
156156
} catch (final MalformedURLException e) {
157157
return Files.newInputStream(
158-
Paths.get(UriComponent.decode(jarUrlString, UriComponent.Type.PATH)));
158+
new File(UriComponent.decode(jarUrlString, UriComponent.Type.PATH)).toPath());
159159
}
160160
}
161161
}

core-server/src/test/java/org/glassfish/jersey/server/JarUtils.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import java.io.IOException;
2323
import java.io.InputStream;
2424
import java.nio.file.Files;
25-
import java.nio.file.Paths;
2625
import java.util.HashMap;
2726
import java.util.HashSet;
2827
import java.util.Map;
@@ -90,7 +89,7 @@ public static File createJarFile(final String name, final Suffix s, final String
9089
jos.putNextEntry(e);
9190

9291
final InputStream f = new BufferedInputStream(
93-
Files.newInputStream(Paths.get(base + entry.getKey())));
92+
Files.newInputStream(new File(base, entry.getKey()).toPath()));
9493
final byte[] buf = new byte[1024];
9594
int read = 1024;
9695
while ((read = f.read(buf, 0, read)) != -1) {

ext/mvc/src/main/java/org/glassfish/jersey/server/mvc/spi/AbstractTemplateProcessor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616

1717
package org.glassfish.jersey.server.mvc.spi;
1818

19+
import java.io.File;
1920
import java.io.IOException;
2021
import java.io.InputStream;
2122
import java.io.InputStreamReader;
2223
import java.io.Reader;
2324
import java.nio.charset.Charset;
2425
import java.nio.file.Files;
25-
import java.nio.file.Paths;
2626
import java.util.ArrayList;
2727
import java.util.Arrays;
2828
import java.util.Collection;
@@ -182,7 +182,7 @@ private T resolve(final String name) {
182182
// File-system path.
183183
if (reader == null) {
184184
try {
185-
reader = new InputStreamReader(Files.newInputStream(Paths.get(template)), encoding);
185+
reader = new InputStreamReader(Files.newInputStream(new File(template).toPath()), encoding);
186186
} catch (final IOException ioe) {
187187
// NOOP.
188188
}

ext/wadl-doclet/src/main/java/org/glassfish/jersey/wadl/doclet/DocletUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818

1919
import java.io.BufferedOutputStream;
2020
import java.io.ByteArrayInputStream;
21+
import java.io.File;
2122
import java.io.OutputStream;
2223
import java.io.StringWriter;
2324
import java.lang.reflect.Array;
2425
import java.lang.reflect.Field;
2526
import java.nio.file.Files;
26-
import java.nio.file.Paths;
2727
import java.util.Arrays;
2828
import java.util.logging.Level;
2929
import java.util.logging.Logger;
@@ -97,7 +97,7 @@ static boolean createOutputFile(String filePath, DocProcessor docProcessor, Reso
9797
Class<?>[] classes = getJAXBContextClasses(result, docProcessor);
9898
LOG.info("cdataElements " + Arrays.asList(cdataElements));
9999
LOG.info("classes " + Arrays.asList(classes));
100-
try (OutputStream out = new BufferedOutputStream(Files.newOutputStream(Paths.get(filePath)))) {
100+
try (OutputStream out = new BufferedOutputStream(Files.newOutputStream(new File(filePath).toPath()))) {
101101
JAXBContext c = JAXBContext.newInstance(classes);
102102
Marshaller m = c.createMarshaller();
103103
m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);

tools/jersey-doc-modulelist-maven-plugin/src/main/java/org/glassfish/jersey/tools/plugins/GenerateJerseyModuleListMojo.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
import org.apache.maven.project.MavenProject;
2929

3030
import java.io.BufferedReader;
31+
import java.io.File;
3132
import java.io.FileNotFoundException;
3233
import java.io.IOException;
3334
import java.io.PrintWriter;
3435
import java.nio.file.Files;
35-
import java.nio.file.Paths;
3636
import java.util.Collections;
3737
import java.util.Comparator;
3838
import java.util.HashMap;
@@ -315,7 +315,7 @@ public void setLog(org.apache.maven.plugin.logging.Log log) {
315315
}
316316

317317
public String readFile(String fileName) throws IOException {
318-
BufferedReader reader = Files.newBufferedReader(Paths.get(fileName));
318+
BufferedReader reader = Files.newBufferedReader(new File(fileName).toPath());
319319
String s;
320320
StringBuilder sb = new StringBuilder();
321321
while ((s = reader.readLine()) != null) {

0 commit comments

Comments
 (0)