Bug 551925: [R-Console] Fix progress name during launch of R console
Follow-up-to: b3df6beb173570fc5d0b7b80c3b01ebe5ce93c40
diff --git a/r/org.eclipse.statet.r.console.ui/src/org/eclipse/statet/internal/r/console/ui/launching/RConsoleRJLaunchDelegate.java b/r/org.eclipse.statet.r.console.ui/src/org/eclipse/statet/internal/r/console/ui/launching/RConsoleRJLaunchDelegate.java
index e9c59b2..b54d104 100644
--- a/r/org.eclipse.statet.r.console.ui/src/org/eclipse/statet/internal/r/console/ui/launching/RConsoleRJLaunchDelegate.java
+++ b/r/org.eclipse.statet.r.console.ui/src/org/eclipse/statet/internal/r/console/ui/launching/RConsoleRJLaunchDelegate.java
@@ -291,10 +291,6 @@
requireCodebase= false;
}
}
- final RMIAddress rmiAddress= new RMIAddress(InetAddress.getLoopbackAddress(), registry.getAddress().getPort(),
- "rjs-local-" + System.currentTimeMillis() ); //$NON-NLS-1$
- final RJEngineLaunchDelegate engineLaunchDelegate= new RJEngineLaunchDelegate(
- rmiAddress.getAddress(), requireCodebase, rEnv);
m.worked(1);
if (m.isCanceled()) {
@@ -304,6 +300,11 @@
// start server
m.subTask(Messages.LaunchDelegate_StartREngine_subtask);
try {
+ final RMIAddress rmiAddress= new RMIAddress(InetAddress.getLoopbackAddress(), registry.getAddress().getPort(),
+ "rjs-local-" + System.currentTimeMillis() ); //$NON-NLS-1$
+ final RJEngineLaunchDelegate engineLaunchDelegate= new RJEngineLaunchDelegate(
+ rmiAddress.getAddress(), requireCodebase, rEnv);
+
RjsComConfig.setRMIClientSocketFactory(null);
engineLaunchDelegate.launch(configuration, mode, launch, m.newChild(10));
