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

Commits on Mar 11, 2015

  1. adjust test expecations after using new psych gem

    @mkristian
    mkristian committed Mar 11, 2015
    Copy the full SHA
    1e7f6ff View commit details

  2. keep the original jar filename in temporary copy

    @mkristian
    mkristian committed Mar 11, 2015
    Copy the full SHA
    4248adb View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 core/src/main/java/org/jruby/util/JRubyClassLoader.java
  2. +1 −1 maven/jruby/src/it/runnable/spec/one_spec.rb
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/util/JRubyClassLoader.java
View file
Original file line number Diff line number Diff line change
@@ -71,7 +71,7 @@ public void addURLNoIndex(URL url) {
OutputStream out = null;
try
{
File f = File.createTempFile( "jruby", ".jar");
File f = File.createTempFile( "jruby", new File(url.getFile()).getName());
f.deleteOnExit();
out = new BufferedOutputStream( new FileOutputStream( f ) );
in = new BufferedInputStream( url.openStream() );
2 changes: 1 addition & 1 deletion maven/jruby/src/it/runnable/spec/one_spec.rb
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

describe "something" do
it "does something" do
# $CLASSPATH.size.should == 4
$CLASSPATH.size.should == 6
Jars.home.should == 'uri:classloader://'
Dir.pwd.should == 'uri:classloader://'
$LOAD_PATH.each do |lp|