Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 814124b6e2e2
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6ceb5374cffa
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jul 24, 2015

  1. you can not close classloaders on jdk6

    @mkristian
    mkristian committed Jul 24, 2015
    3
    Copy the full SHA
    376eba1 View commit details

  2. make it 1.8 compatible

    @mkristian
    mkristian committed Jul 24, 2015
    Copy the full SHA
    6ceb537 View commit details
Showing with 1 addition and 6 deletions.
  1. +0 −4 core/src/main/java/org/jruby/javasupport/JavaEmbedUtils.java
  2. +1 −2 lib/ruby/shared/rubygems/defaults/jruby.rb
4 changes: 0 additions & 4 deletions core/src/main/java/org/jruby/javasupport/JavaEmbedUtils.java
View file
Original file line number Diff line number Diff line change
@@ -246,10 +246,6 @@ public static void addGemPath(Ruby runtime, ClassLoader cl) {
*/
public static void terminate(Ruby runtime) {
runtime.tearDown();
try {
runtime.getJRubyClassLoader().close();
} catch (IOException weTriedToCloseIt) {
}
}

/**
3 changes: 1 addition & 2 deletions lib/ruby/shared/rubygems/defaults/jruby.rb
View file
Original file line number Diff line number Diff line change
@@ -111,8 +111,7 @@ def spec_directories_from_classpath
stuff = [ 'uri:classloader://specifications' ] + JRuby::Util.classloader_resources("specifications")
# some classloader return directory info. use only the "protocols"
# which jruby understands
stuff.select! { |s| File.directory?( s ) }
stuff
stuff.select { |s| File.directory?( s ) }
end
end
end