Merge pull request #297 from achanda/jvm_opts_fix

Actually append jvm opts to the CLI
hashicorp · Oct 17, 2015 · 628f395 · 628f395
2 parents 356ddfe + 1a3f79c
commit 628f395
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/client/driver/java.go b/client/driver/java.go
@@ -138,6 +138,7 @@ func (d *JavaDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle,
 	jvm_options, ok := task.Config["jvm_options"]
 	if ok && jvm_options != "" {
 		d.logger.Printf("[DEBUG] driver.java: found JVM options: %s", jvm_options)
+		args = append(args, jvm_options)
 	}
 
 	// Build the argument list

diff --git a/client/driver/java_test.go b/client/driver/java_test.go
@@ -100,6 +100,7 @@ func TestJavaDriver_Start_Wait(t *testing.T) {
 			"jar_source": "https://dl.dropboxusercontent.com/u/47675/jar_thing/demoapp.jar",
 			// "jar_source": "https://s3-us-west-2.amazonaws.com/java-jar-thing/demoapp.jar",
 			// "args": "-d64",
+			"jvm_options": "-Xmx2048m -Xms256m",
 		},
 		Resources: basicResources,
 	}