Skip to content

Loading…

Add missing throw to default_internal=. #492

Merged
merged 1 commit into from

2 participants

@tychobrailleur

The exception is created but not thrown in setDefaultInternal; the same issue used to exist for setDefaultExternal, but was previously fixed.

@BanzaiMan BanzaiMan merged commit c05dd00 into jruby:master

1 check failed

Details default The Travis build failed
@BanzaiMan
JRuby Team member

Travis seems to be having a problem with VMs with JVM on it. This should be a low-impact merge.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jan 11, 2013
  1. @tychobrailleur
Showing with 1 addition and 1 deletion.
  1. +1 −1 src/org/jruby/RubyEncoding.java
View
2 src/org/jruby/RubyEncoding.java 100644 → 100755
@@ -474,7 +474,7 @@ public static IRubyObject setDefaultInternal(IRubyObject recv, IRubyObject encod
Ruby runtime = recv.getRuntime();
EncodingService service = runtime.getEncodingService();
if (encoding.isNil()) {
- recv.getRuntime().newArgumentError("default_internal can not be nil");
+ throw recv.getRuntime().newArgumentError("default_internal can not be nil");
}
recv.getRuntime().setDefaultInternalEncoding(service.getEncodingFromObject(encoding));
return encoding;
Something went wrong with that request. Please try again.