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: d79f665a7929
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 707df9f0dddd
Choose a head ref
  • 8 commits
  • 3 files changed
  • 1 contributor

Commits on Jul 30, 2015

  1. Copy the full SHA
    3474eea View commit details
  2. Copy the full SHA
    4f88af6 View commit details
  3. Copy the full SHA
    5fb03c7 View commit details
  4. Copy the full SHA
    5bbee5a View commit details
  5. Copy the full SHA
    94e54f3 View commit details
  6. Copy the full SHA
    b05091c View commit details

Commits on Jul 31, 2015

  1. Copy the full SHA
    e65ff51 View commit details
  2. Merge branch 'jruby-1_7'

    * jruby-1_7:
      missed parenthesis in assert around [ array.join(', ') ]
      deal with jruby-openssl pre-release not being reported by `Gem.loaded_specs`
      swap assert argument order - so that first is always the expectation (less confusing)
      more 1-by-1 checks for jar-dependencies & jruby-openssl in build.log
      check jar-dependencies & jruby-openssl in log 1-by-1
      do not assume gem order in (osgi) embed test
    kares committed Jul 31, 2015
    Copy the full SHA
    707df9f View commit details
10 changes: 0 additions & 10 deletions core/src/main/java/org/jruby/util/JRubyClassLoader.java
Original file line number Diff line number Diff line change
@@ -128,16 +128,6 @@ public void close() {
catch (Exception ex) { LOG.debug(ex); }
}

/**
* Helper to close the JRuby class-loader.
* @param loader
* @note This is internal API, do not rely on it to exists!
*/
public static void close(final JRubyClassLoader loader) {
if ( loader == null ) return;
loader.close();
}

@Deprecated
public synchronized Runnable getJDBCDriverUnloader() {
if (unloader == null) {
Original file line number Diff line number Diff line change
@@ -92,7 +92,7 @@ public void testJRubyCreate() throws Exception {

String gemPath = (String) jruby.runScriptlet( "Gem::Specification.dirs.inspect" );
gemPath = gemPath.replaceAll( "bundle[^:]*://[^/]*", "bundle:/" );
assertEquals( gemPath, "[\"uri:bundle://specifications\"]" );
assertEquals( "[\"uri:bundle://specifications\"]", gemPath );

// ensure we can load rake from the default gems
boolean loaded = (Boolean) jruby.runScriptlet( "require 'rake'" );
Original file line number Diff line number Diff line change
@@ -93,7 +93,7 @@ public void testJRubyCreate() throws InterruptedException {

gemPath = gemPath.replaceAll( "bundle[^:]*://[^/]*", "bundle:/" );
// TODO fix the URLResource to produce uri:classloader:// urls only
assertEquals( gemPath, "[\"uri:classloader:/specifications\", \"uri:classloader://specifications\"]" );
assertEquals( "[\"uri:classloader:/specifications\", \"uri:classloader://specifications\"]", gemPath );

jruby.runScriptlet( "require 'jar-dependencies'" );