From 1cf29d11e36da490e896982e5c9ffe35354ca158 Mon Sep 17 00:00:00 2001 From: Charles Oliver Nutter Date: Mon, 8 Dec 2014 15:34:07 -0600 Subject: [PATCH] No logical reason to assert if warning called in non-verbose mode. --- .../src/main/java/org/jruby/common/RubyWarnings.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/core/src/main/java/org/jruby/common/RubyWarnings.java b/core/src/main/java/org/jruby/common/RubyWarnings.java index f13ec3ce40a..a25836752c7 100644 --- a/core/src/main/java/org/jruby/common/RubyWarnings.java +++ b/core/src/main/java/org/jruby/common/RubyWarnings.java @@ -126,7 +126,7 @@ public void warning(String message) { @Override public void warning(ID id, String message) { - if (!runtime.warningsEnabled()) return; + if (!runtime.warningsEnabled() || !runtime.isVerbose()) return; RubyStackTraceElement[] stack = getRubyStackTrace(runtime); String file; @@ -148,8 +148,6 @@ public void warning(ID id, String message) { */ @Override public void warning(ID id, ISourcePosition position, String message) { - if (!runtime.warningsEnabled()) return; - warning(id, position.getFile(), position.getStartLine() + 1, message); } @@ -158,9 +156,7 @@ public void warning(ID id, ISourcePosition position, String message) { */ @Override public void warning(ID id, String fileName, int lineNumber, String message) { - assert isVerbose(); - - if (!runtime.warningsEnabled()) return; + if (!runtime.warningsEnabled() || !runtime.isVerbose()) return; warn(id, fileName, lineNumber, message); } @@ -181,7 +177,7 @@ public void warn(ID id, ISourcePosition position, String message, Object... data @Deprecated @Override public void warn(ID id, String fileName, int lineNumber, String message, Object... data) { - if (!runtime.warningsEnabled()) return; // TODO make an assert here + if (!runtime.warningsEnabled()) return; StringBuilder buffer = new StringBuilder(100); @@ -219,7 +215,7 @@ public void warning(ID id, ISourcePosition position, String message, Object... d @Deprecated @Override public void warning(ID id, String fileName, int lineNumber, String message, Object... data) { - assert isVerbose(); + if (!runtime.warningsEnabled() || !runtime.isVerbose()) return; warn(id, fileName, lineNumber, message, data); } }