Skip to content

Change to use FileResource to get entries for RubyDir#1526

Merged
enebo merged 2 commits intojruby:jruby-1_7from
ratnikov:fileresource-rubydir
Mar 3, 2014
Merged

Change to use FileResource to get entries for RubyDir#1526
enebo merged 2 commits intojruby:jruby-1_7from
ratnikov:fileresource-rubydir

Conversation

@ratnikov
Copy link
Contributor

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

Dmitry Ratnikov added 2 commits March 2, 2014 13:49
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
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
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
@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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants