Change script file restriction #4100

Merged
merged 2 commits into from Aug 24, 2016

Conversation

Projects
None yet
3 participants
@jellymann
Contributor

jellymann 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

This comment has been minimized.

Show comment
Hide comment
@mkristian

mkristian Aug 22, 2016

Member

+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.

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.

@jellymann

This comment has been minimized.

Show comment
Hide comment
@jellymann

jellymann Aug 22, 2016

Contributor

@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

Contributor

jellymann 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

This comment has been minimized.

Show comment
Hide comment
@mkristian

mkristian Aug 23, 2016

Member
Member

mkristian commented Aug 23, 2016

@mkristian

This comment has been minimized.

Show comment
Hide comment
@mkristian

mkristian Aug 23, 2016

Member

@headius for me this is good to merge

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

continuous-integration/appveyor/pr AppVeyor build failed
Details
continuous-integration/travis-ci/pr The Travis CI build failed
Details

@enebo enebo added this to the JRuby 9.1.3.0 milestone Aug 24, 2016

@jellymann jellymann deleted the jellymann: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