Skip to content

Commit e0bfc1a

Browse files
committed
[chore] Remove JRuby < 1.7 backward compatibility logic
1 parent 8fa0936 commit e0bfc1a

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

src/main/ruby/jruby/rack/capture.rb

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,7 @@ def capture
4747
if JRuby.runtime.instance_config.respond_to?(:trace_type)
4848
trace_type = JRuby.runtime.instance_config.trace_type # getTraceType
4949
begin
50-
if JRUBY_VERSION < '1.7'
51-
full_trace = trace_type.print_backtrace(self)
52-
else
53-
full_trace = trace_type.print_backtrace(self, false)
54-
end
50+
full_trace = trace_type.print_backtrace(self, false)
5551
rescue => e
5652
warn "failed to print backtrace due: #{e}" rescue nil
5753
full_trace = backtrace.join("\n")

src/spec/ruby/cgi/session/java_servlet_store_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,6 @@ def hmac(key, data)
171171
expect(@session).to receive(:getLastAccessedTime).and_return 123
172172
expect(@session).to receive(:setAttribute).with("__rails_secret", "abcrandom123")
173173
expect(@dbman.generate_digest("key")).to eq(hmac("abcrandom123", "key"))
174-
end unless JRUBY_VERSION < '1.7.0'
174+
end
175175
end
176176
end

0 commit comments

Comments
 (0)