dealing with joda-time-2.5 ArithmeticException

jruby · Nov 14, 2014 · ef6182f · ef6182f
1 parent b4f75d5
commit ef6182f
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/core/src/main/java/org/jruby/RubyTime.java b/core/src/main/java/org/jruby/RubyTime.java
@@ -1058,7 +1058,13 @@ 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 cab throw this exception
+	    catch( ArithmeticException e ) {
+		throw runtime.newRangeError(e.getMessage());
+	    }
         }
 
         time.getMetaClass().getBaseCallSite(RubyClass.CS_IDX_INITIALIZE).call(context, recv, time);