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.

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

Change to use FileResource to get entries for RubyDir #1526

Merged
merged 2 commits into from Mar 3, 2014

Conversation

Projects
None yet
2 participants
@ratnikov
Copy link
Contributor

ratnikov commented Feb 23, 2014

This might fix #1100 although I haven't verified this yet.

ratnikov added some commits Feb 23, 2014

Switch to use resources to get directory entries.
Current jar Dir.entries implementation doesn't return "." and ".." so to keep this behavior in 1.7,
I've moved the "." and ".." addition logic to RegularFileResource. Unfortunately fixing the jar files to
support such behavior would require and invasive refactor of File/Dir implementations to be able to support
expanding '..' in jar file names.
@ratnikov

This comment has been minimized.

Copy link
Contributor Author

ratnikov commented Mar 2, 2014

This PR replaces using JarFile directly from RubyDir in favor of using file resources. It is ready for merge.

enebo added a commit that referenced this pull request Mar 3, 2014

Merge pull request #1526 from ratnikov/fileresource-rubydir
Change to use FileResource to get entries for RubyDir (will follow up to re-add the non-TC initialize methods for backwards compat)

@enebo enebo merged commit c1f333b into jruby:jruby-1_7 Mar 3, 2014

1 check failed

default The Travis CI build could not complete due to an error
Details

@enebo enebo added this to the JRuby 1.7.12 milestone Apr 15, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.