Skip to content

Commit 48ed37a

Browse files
author
Glyn Normington
committed
Disable memory heuristics code
Do not delete the code as it is applicable just as soon as Cloud Foundry makes $MEMORY_LIMIT available to the buildpack. [#51571605]
1 parent c5db21c commit 48ed37a

2 files changed

Lines changed: 10 additions & 6 deletions

File tree

lib/java_buildpack/jre/openjdk.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ def initialize(context = {})
4444
#
4545
# @return [String, nil] returns +jre-<vendor>-<version>+.
4646
def detect
47-
memory_sizes # drive out errors early
47+
# memory_sizes # drive out errors early
4848
id @details
4949
end
5050

5151
# Downloads and unpacks a JRE
5252
#
5353
# @return [void]
5454
def compile
55-
memory_sizes # drive out errors early
55+
# memory_sizes # drive out errors early
5656
application_cache = JavaBuildpack::Util::ApplicationCache.new
5757

5858
download_start_time = Time.now
@@ -68,9 +68,9 @@ def compile
6868
#
6969
# @return [void]
7070
def release
71-
memory_sizes.each do |memory_size|
72-
@java_opts << memory_size
73-
end
71+
#memory_sizes.each do |memory_size|
72+
# @java_opts << memory_size
73+
#end
7474
end
7575

7676
private

spec/java_buildpack/jre/openjdk_spec.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@
1919

2020
module JavaBuildpack::Jre
2121

22-
describe OpenJdk do
22+
RSpec.configure do |c|
23+
c.filter_run_excluding :waiting_for_memory_limit_support => true
24+
end
25+
26+
describe OpenJdk, :waiting_for_memory_limit_support => true do
2327

2428
HEAP_SIZE = '1G'
2529

0 commit comments

Comments
 (0)