Log Message
fixed serialization bug
Modified Paths
Diff
Modified: trunk/hudson/plugins/vncviewer/src/main/java/org/jenkinsci/plugins/vncviewer/VncViewerBuildWrapper.java (41273 => 41274)
--- trunk/hudson/plugins/vncviewer/src/main/java/org/jenkinsci/plugins/vncviewer/VncViewerBuildWrapper.java 2015-03-26 09:39:52 UTC (rev 41273)
+++ trunk/hudson/plugins/vncviewer/src/main/java/org/jenkinsci/plugins/vncviewer/VncViewerBuildWrapper.java 2015-03-26 09:47:22 UTC (rev 41274)
@@ -80,17 +80,17 @@
final BuildListener listener) throws IOException, InterruptedException
{
DescriptorImpl DESCRIPTOR = Hudson.getInstance().getDescriptorByType(DescriptorImpl.class);
- vncServ = Util.replaceMacro(vncServ,build.getEnvironment(listener));
+ String vncServReplaced = Util.replaceMacro(vncServ,build.getEnvironment(listener));
int localPort = 8888;
Proc noVncProc = null;
String lp = String.valueOf(localPort);
final ByteArrayOutputStream loggingStream = new ByteArrayOutputStream();
- if (vncServ.isEmpty())
- vncServ = DESCRIPTOR.getDefaultVncServ();
+ if (vncServReplaced.isEmpty())
+ vncServReplaced = DESCRIPTOR.getDefaultVncServ();
- if (vncServ.indexOf(":") < 0)
+ if (vncServReplaced.indexOf(":") < 0)
{
- vncServ += ":5900";
+ vncServReplaced += ":5900";
}
try {
untar(VncViewerBuildWrapper.class.getResourceAsStream("/novnc.tar"),System.getProperty("java.io.tmpdir"));
@@ -106,7 +106,7 @@
for (int i = 0; i < 1000 ; i++ )
{
lp = String.valueOf(localPort + i);
- noVncProc = localLauncher.launch().stderr(loggingStream).stdout(loggingStream).cmds(webSockifyPath, "--web", webPath,lp,getVncServ()).start();
+ noVncProc = localLauncher.launch().stderr(loggingStream).stdout(loggingStream).cmds(webSockifyPath, "--web", webPath,lp,vncServReplaced).start();
Thread.sleep(5000);
if (noVncProc.isAlive())
{
@@ -125,7 +125,7 @@
String hostAddr = InetAddress.getLocalHost().getHostName();
String url = "" + hostAddr + ":" + localPort + "/vnc_auto.html?host=" + hostAddr + "&port=" + localPort;
- String txt = "Start vnc viewer for " + vncServ;
+ String txt = "Start vnc viewer for " + vncServReplaced;
listener.getLogger().print('\n');
listener.annotate(new VncHyperlinkNote(url,txt.length()));
listener.getLogger().print(txt);
@@ -135,7 +135,7 @@
@Override
public void buildEnvVars(Map<String, String> env) {
// env.put("PATH",env.get("PATH"));
- // env.put("DISPLAY", vncServ);
+ // env.put("DISPLAY", vncServReplaced);
}
@Override
public boolean tearDown(AbstractBuild build, BuildListener listener)
You received this message because you are subscribed to the Google Groups "Jenkins Commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
For more options, visit https://groups.google.com/d/optout.
