Merged
Conversation
File/IO readlines supporting new params limit, and open mode (thanks jose!)
Restore $! when catching exception. In most cases jnr-posix on an error will throw and not get caught like this. This is a special case and without significant changes jnr-posix this looks like the best fix to me.
It seems that www.amazon.com changed the CA cert it uses for its ssl connection, and that caused us to start failing tests. After some investigation, I figured out which cert we needed and what the filename needed to be in the ca_path test. I have added a README.txt to the ca_path and comments to all the related certs. I also removed a cert file that appeared to be duplicate and added a more explicitly incorrect cert for the test that is supposed to fail verification.
This should fix jruby#653. We may catch too much here, but it seems the intent of the rescue block was to capture most exceptions. It also would have caught the ant ExitStatusException as a NativeException before, but that stopped working after we stopped wrapping Java exceptions. The fix should catch it properly now.
…ease? to cast NullPointerException
This reverts commit 05de78e.
…h_offset IO.binwrite doesn't truncate the file if an offset is given
…specs Refactored directed graph specs
Conflicts: .classpath nbproject/project.xml
Member
|
Wow, I don't know what happened there, but it's merged. |
Member
|
EPIC!!! |
This pull request was closed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I've added an OSGi integration test. Currently it needs to be run after ant jar-jruby-complete and you need to use either the felix2 or felix4 profile. I'm open to suggestions for how to better integrate the test case.
After adding the test case, I added a different method to find the classloader for a bundle. I added this as a set of new classes, mostly because I wanted to ensure any users of the existing classes wouldn't be affected.
I verified that the new method does fallback correctly in the felix2 profile (which doesn't export the new org.osgi.framework.wiring package.