Skip to content

Commit fd631fb

Browse files
committed
default OpenSSL.warn to warnings-enabled flag
1 parent ef4392d commit fd631fb

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/main/java/org/jruby/ext/openssl/OpenSSL.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ public static void createOpenSSL(final Ruby runtime) {
6767

6868
final String warn = SafePropertyAccessor.getProperty("jruby.openssl.warn");
6969
if ( warn != null ) OpenSSL.warn = Boolean.parseBoolean(warn);
70+
else OpenSSL.warn = runtime.warningsEnabled();
7071

7172
// Config.createConfig(runtime, _OpenSSL);
7273
ExtConfig.create(runtime, _OpenSSL);
@@ -177,7 +178,7 @@ public static IRubyObject check_func(final IRubyObject self, final IRubyObject[]
177178
@JRubyMethod(name = "fips_mode=", meta = true)
178179
public static IRubyObject set_fips_mode(ThreadContext context, IRubyObject self, IRubyObject value) {
179180
if ( value.isTrue() ) {
180-
warn(context, "WARNING: FIPS mode not supported on JRuby-OpenSSL");
181+
warn(context, "FIPS mode not supported on JRuby-OpenSSL");
181182
}
182183
return value;
183184
}
@@ -235,7 +236,7 @@ public static void debug(final Ruby runtime, final CharSequence msg, final Throw
235236
}
236237

237238
static void warn(final ThreadContext context, final CharSequence msg) {
238-
warn(context, RubyString.newString(context.runtime, msg));
239+
if ( warn ) warn(context, RubyString.newString(context.runtime, msg));
239240
}
240241

241242
static void warn(final ThreadContext context, final RubyString msg) {

0 commit comments

Comments
 (0)