Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Loading keystore resource if location starts with / #4258

Merged
merged 2 commits into from
Sep 18, 2019
Merged

Loading keystore resource if location starts with / #4258

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2d5d29
Loading keystore resource if location starts with /
Verdent Sep 12, 2019
de11053
typo in comment fixed
Verdent Sep 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ...client/src/main/java/org/glassfish/jersey/microprofile/restclient/RestClientProducer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,11 +329,14 @@ private InputStream locationToStream(String location) throws IOException {

if (location.startsWith(CLASSPATH_LOCATION)) {
String resource = location.substring(CLASSPATH_LOCATION.length());
// first try to read from teh same classloader as the rest client interface
// first try to read from the same classloader as the rest client interface
InputStream result = interfaceType.getResourceAsStream(resource);
if (null == result) {
Verdent marked this conversation as resolved.
Show resolved Hide resolved
// and if not found, use the context classloader (for example in TCK, this is needed)
result = Thread.currentThread().getContextClassLoader().getResourceAsStream(resource);
if (result == null && resource.startsWith("/")) {
result = Thread.currentThread().getContextClassLoader().getResourceAsStream(resource.substring(1));
}
}
return result;
} else if (location.startsWith(FILE_LOCATION)) {
Expand Down