Skip to content

Commit 1fc53aa

Browse files
committed
Augment, don't replace environment
Along the attempts to track down the Travis failure, this updates the application_helper to augment the environment rather than outright replacing it.
1 parent 189c321 commit 1fc53aa

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

lib/java_buildpack/buildpack.rb

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,11 @@ def instantiate(components, additional_libraries, application, java_home, java_o
127127
require_component(component)
128128

129129
component_id = component.split('::').last.snake_case
130-
context = { application: application,
131-
configuration: Util::ConfigurationUtils.load(component_id),
132-
droplet: Component::Droplet.new(additional_libraries, component_id, java_home, java_opts, root) }
130+
context = {
131+
application: application,
132+
configuration: Util::ConfigurationUtils.load(component_id),
133+
droplet: Component::Droplet.new(additional_libraries, component_id, java_home, java_opts, root)
134+
}
133135

134136
component.constantize.new(context)
135137
end

spec/application_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
end
3232

3333
before do
34-
ENV.replace environment
34+
ENV.update environment
3535
end
3636

3737
after do

0 commit comments

Comments
 (0)