Merge 51899933-Play-container to master

Glyn Normington · Glyn Normington · commit 2ee51e7db871 · 2013-06-25T15:38:15.000+01:00
[#51899933]
diff --git a/lib/java_buildpack/container/play.rb b/lib/java_buildpack/container/play.rb
@@ -58,10 +58,10 @@ def compile
     # @return [String] the command to run the application.
     def release
       @java_opts << "-D#{KEY_HTTP_PORT}=$PORT"
-      # Change single quotes to double quotes with escape so that options such as
-      # -XX:OnOutOfMemoryError='kill -9 %p' pass through the Play start script correctly.
-      quoted_java_opts = java_opts.gsub("'", '\"')
-      "PATH=#{@java_home}/bin:$PATH JAVA_HOME=#{@java_home} ./#{PLAY_START_SCRIPT} #{quoted_java_opts}"
+      # Expunge the option OnOutOfMemoryError option if it occurs as it does not seem possible to pass
+      # this through to the Play start script correctly.
+      sanitised_java_opts = java_opts.gsub("-XX:OnOutOfMemoryError='kill -9 %p'", '')
+      "PATH=#{@java_home}/bin:$PATH JAVA_HOME=#{@java_home} ./#{PLAY_START_SCRIPT} #{sanitised_java_opts}"
     end
 
     private
