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

Commits on Nov 24, 2014

  1. fix another joda-2.5 exception 

    one exception I see only locally and the other I see only on travis - no idea why. treat both
as RangeError on the ruby side which honors the test-case.
    @mkristian
    mkristian committed Nov 24, 2014
    Copy the full SHA
    f9190ce View commit details

  2. Merge branch 'master' of github.com:jruby/jruby

    @mkristian
    mkristian committed Nov 24, 2014
    Copy the full SHA
    461f315 View commit details

  3. fix the ASM test on -Pdist

    @mkristian
    mkristian committed Nov 24, 2014
    Copy the full SHA
    e526e61 View commit details
Showing with 17 additions and 8 deletions.
  1. +12 −1 core/src/main/java/org/jruby/RubyTime.java
  2. +2 −4 maven/jruby-dist/src/it/integrity/pom.xml
  3. +3 −3 maven/jruby-dist/src/it/integrity/verify.bsh
13 changes: 12 additions & 1 deletion core/src/main/java/org/jruby/RubyTime.java
View file
Original file line number Diff line number Diff line change
@@ -49,6 +49,7 @@
import org.jcodings.specific.USASCIIEncoding;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import org.joda.time.IllegalFieldValueException;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;
import org.joda.time.tz.FixedDateTimeZone;
@@ -1050,7 +1051,17 @@ public static IRubyObject at(ThreadContext context, IRubyObject recv, IRubyObjec
nanosecs = nano % 1000000;
}
time.setNSec(nanosecs);
time.dt = time.dt.withMillis(seconds * 1000 + millisecs);
try {
time.dt = time.dt.withMillis(seconds * 1000 + millisecs);
}
// joda-time 2.5 can throw this exception - seen locally
catch(ArithmeticException e1) {
throw runtime.newRangeError(e1.getMessage());
}
// joda-time 2.5 can throw this exception - seen on travis
catch(IllegalFieldValueException e2) {
throw runtime.newRangeError(e2.getMessage());
}
}

time.getMetaClass().getBaseCallSite(RubyClass.CS_IDX_INITIALIZE).call(context, recv, time);
6 changes: 2 additions & 4 deletions maven/jruby-dist/src/it/integrity/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -157,10 +157,8 @@
<configuration>
<executable>java</executable>
<arguments>
<argument>-classpath</argument>
<!-- automatically creates the classpath using all project dependencies,
also adding the project build directory -->
<classpath/>
<argument>-Xbootclasspath/a:${jruby.home}/lib/jruby.jar</argument>
<argument>-Djruby.home=${jruby.home}</argument>
<argument>org.jruby.Main</argument>
<argument>-e</argument>
<!-- make sure openssl loads -->
6 changes: 3 additions & 3 deletions maven/jruby-dist/src/it/integrity/verify.bsh
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import java.io.*;
import org.codehaus.plexus.util.fileutils;
import org.codehaus.plexus.util.FileUtils;


string log = fileutils.fileread( new file( basedir, "build.log" ) );
string expected = "rake (10.1.0)";
String log = FileUtils.fileRead( new File( basedir, "build.log" ) );
String expected = "rake (10.1.0)";
if ( !log.contains( expected ) )
{
throw new runtimeexception( "log file does not contain '" + expected + "'" );