Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Tiede2013-12-17 04:06:27 -0500
committerMarkus Tiede2013-12-17 04:06:27 -0500
commitd488a87d1a960ed3cff11d6178095364c80b43e5 (patch)
tree3a9fe3954186693b5f042ff9d0f1c44b18951536 /org.eclipse.jubula.autagent
parentcd471889f961cfbf0e1136f1a5a63b5816a74473 (diff)
downloadorg.eclipse.jubula.core-d488a87d1a960ed3cff11d6178095364c80b43e5.tar.gz
org.eclipse.jubula.core-d488a87d1a960ed3cff11d6178095364c80b43e5.tar.xz
org.eclipse.jubula.core-d488a87d1a960ed3cff11d6178095364c80b43e5.zip
Revert "Sprint task - fix for p1 issue http://bugzilla.bredex.de/1288"
Diffstat (limited to 'org.eclipse.jubula.autagent')
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAutServer.java21
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ChooseCheckModeDialogBP.java3
2 files changed, 12 insertions, 12 deletions
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAutServer.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAutServer.java
index ffb0edbbd..cdebf0e32 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAutServer.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAutServer.java
@@ -20,7 +20,6 @@ import java.util.StringTokenizer;
import java.util.Vector;
import org.eclipse.jubula.autagent.AutStarter;
-import org.eclipse.jubula.communication.Communicator;
import org.eclipse.jubula.tools.constants.AutConfigConstants;
import org.eclipse.jubula.tools.constants.CommandConstants;
import org.eclipse.jubula.tools.constants.StringConstants;
@@ -72,10 +71,9 @@ public abstract class AbstractStartJavaAutServer extends AbstractStartJavaAut {
if (isRunningFromExecutable(parameters)) {
// agent arguments
String serverPort = "null"; //$NON-NLS-1$
- final Communicator autCommunicator = AutStarter.getInstance()
- .getAutCommunicator();
- if (autCommunicator != null) {
- serverPort = String.valueOf(autCommunicator.getLocalPort());
+ if (AutStarter.getInstance().getAutCommunicator() != null) {
+ serverPort = String.valueOf(AutStarter.getInstance()
+ .getAutCommunicator().getLocalPort());
}
env += ENV_SEPARATOR + "AUT_SERVER_PORT=" + serverPort; ////$NON-NLS-1$
@@ -171,10 +169,10 @@ public abstract class AbstractStartJavaAutServer extends AbstractStartJavaAut {
protected void createAutServerClasspath(StringBuffer autServerClasspath,
List cmds, Map parameters) {
- final Communicator autCommunicator = AutStarter.getInstance()
- .getAutCommunicator();
- if (autCommunicator != null) {
- cmds.add(String.valueOf(autCommunicator.getLocalPort()));
+ if (AutStarter.getInstance().getAutCommunicator() != null) {
+ cmds.add(String.valueOf(
+ AutStarter.getInstance().getAutCommunicator()
+ .getLocalPort()));
} else {
cmds.add("null"); //$NON-NLS-1$
}
@@ -241,7 +239,8 @@ public abstract class AbstractStartJavaAutServer extends AbstractStartJavaAut {
cmds.add("-classpath"); //$NON-NLS-1$
StringBuffer autClassPath = createAutClasspath(parameters);
String serverBasePath = createServerBasePath();
- cmds.add(autClassPath.append(PATH_SEPARATOR)
+ cmds.add(
+ autClassPath.append(PATH_SEPARATOR)
.append(serverBasePath).toString());
// add classname of autLauncher
cmds.add(CommandConstants.AUT_SERVER_LAUNCHER);
@@ -269,7 +268,7 @@ public abstract class AbstractStartJavaAutServer extends AbstractStartJavaAut {
}
}
- // add debug options (if necessary)
+ // add debug options (if neccessary)
addDebugParams(cmds, false);
// add -Duser.dir and workingDir here
}
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ChooseCheckModeDialogBP.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ChooseCheckModeDialogBP.java
index 9324bea17..b61faffe7 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ChooseCheckModeDialogBP.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ChooseCheckModeDialogBP.java
@@ -352,7 +352,8 @@ public class ChooseCheckModeDialogBP {
AutStarter.getInstance().getAutCommunicator();
if (autCommunicator != null
&& autCommunicator.getConnection() != null) {
- autCommunicator.send(responseMsg);
+ AutStarter.getInstance().getAutCommunicator().send(
+ responseMsg);
}
} catch (CommunicationException e) {
LOG.error("Error sending message!", e); //$NON-NLS-1$

Back to the top