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 script file restriction #4100

Merged
merged 2 commits into from Aug 24, 2016
Merged

Conversation

danini-the-panini
Copy link
Contributor

@danini-the-panini danini-the-panini commented Aug 22, 2016

Fix for issue exposed by #3901.

Extension of #3902 for 9k, with tests and an isDirectory check (canRead returns true for directories, but then throws when calling inputStream)

I'm not sure about testing CON on Windows. I have only tested on macOS so far.

These tests (and isDirectory change) would also need to backported to the 1.7 branch

CC @mkristian and @headius

@mkristian
Copy link
Member

mkristian commented Aug 22, 2016

+1 for the commit

@jellymann could you remove all those maven-metadata-local.xml files. I have seen them creeping in before but do not have an idea how this happens.

@danini-the-panini
Copy link
Contributor Author

danini-the-panini commented Aug 22, 2016

@mkristian Sorry about that. I saw them get created and meant to make sure not to commit them, but I must have forgotten. They seem to have been created the first time I ran mvn after cloning

@mkristian
Copy link
Member

mkristian commented Aug 23, 2016

@mkristian
Copy link
Member

mkristian commented Aug 23, 2016

@headius for me this is good to merge

@enebo enebo merged commit 5717e35 into jruby:master Aug 24, 2016
0 of 2 checks passed
@enebo enebo added this to the JRuby 9.1.3.0 milestone Aug 24, 2016
@danini-the-panini danini-the-panini deleted the fix-stdin-bug branch Aug 25, 2016
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.

None yet

3 participants