From 04809538cd15a1811f4e2232330c3d0f95016457 Mon Sep 17 00:00:00 2001
From: Shams Asari <shams.asari@r3.com>
Date: Mon, 9 Jul 2018 12:39:43 +0100
Subject: [PATCH] Merge fix

---
 .../integration-test/kotlin/net/corda/bridge/BridgeDriver.kt   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bridge/src/integration-test/kotlin/net/corda/bridge/BridgeDriver.kt b/bridge/src/integration-test/kotlin/net/corda/bridge/BridgeDriver.kt
index 973c7b6098..8988647c24 100644
--- a/bridge/src/integration-test/kotlin/net/corda/bridge/BridgeDriver.kt
+++ b/bridge/src/integration-test/kotlin/net/corda/bridge/BridgeDriver.kt
@@ -28,11 +28,10 @@ data class BridgeHandle(
 )
 
 fun startBridgeProcess(bridgePath: Path, debugPort: Int?): Process {
-    return ProcessUtilities.startCordaProcess(
+    return ProcessUtilities.startJavaProcess(
             className = "net.corda.bridge.Firewall",
             arguments = listOf("--base-directory", bridgePath.toString()),
             jdwpPort = debugPort,
-            extraJvmArguments = listOf(),
             workingDirectory = bridgePath,
             maximumHeapSize = "200m"
     )