Join GitHub today
GitHub is home to over 31 million developers working together to host and review code, manage projects, and build software together.
Sign uprefactor FileResource.inputStream to be easier to use #2271
Conversation
mkristian
added this to the JRuby 1.7.17 milestone
Dec 3, 2014
mkristian
added
the
openssl
label
Dec 3, 2014
mkristian
force-pushed the
FileResource.inputStream
branch
from
18da34f
to
adb3a85
Dec 3, 2014
mkristian
force-pushed the
FileResource.inputStream
branch
from
adb3a85
to
36e2ed4
Dec 3, 2014
ratnikov
reviewed
Dec 3, 2014
| /** | ||
| * opens input-stream to the underlying resource. this is place where | ||
| * the input-stream gets opened. users of this method should follow the pattern: | ||
| * close the stream where you open it. |
This comment has been minimized.
This comment has been minimized.
ratnikov
Dec 3, 2014
Contributor
I'd keep rationale for closing (implementations allocating native memory) in the new comment.
ratnikov
reviewed
Dec 3, 2014
| @@ -235,8 +236,11 @@ public ResourceLibrary(String searchName, String scriptName, FileResource resour | |||
|
|
|||
| @Override | |||
| public void load(Ruby runtime, boolean wrap) { | |||
| InputStream is = resource.openInputStream(); | |||
| if (is == null) { | |||
This comment has been minimized.
This comment has been minimized.
ratnikov
Dec 3, 2014
Contributor
I think this change is from some other commit, since doesn't seem to do the pure refactor.
This comment has been minimized.
This comment has been minimized.
|
merge manually |
mkristian
closed this
Dec 5, 2014
mkristian
deleted the
FileResource.inputStream
branch
Dec 6, 2014
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
mkristian commentedDec 3, 2014
for any client code which needs to convert a uri-like path to an inputstream
the way to go is
JRubyFile.create(runtime, path).inputStream()the motivation for this PR comes from jruby-openssl-0.9.6.dev:
from the user there comes a String with path to a PEM resource. as it turns out this path can be any uri-like path (like from rubygems: https://github.com/jruby/jruby/blob/master/lib/ruby/stdlib/rubygems/request.rb#L42).
the following boilerplate code to convert a uri-like path into an input-stream:
jruby/jruby-openssl@aa51d9b#diff-67972a6a9364f41a90295ceabf0e9180R298
is a fix for jruby-1.7.16.1
this PR cleans up the API for such "conversion" and to release jruby-openssl with this clean API it needs a released jruby version with this PR merged.