Merge pull request #2 from UniversalRobots/fix_installation_timeout

Felix Exner · web-flow · commit 10066bb1c458 · 2020-08-13T22:30:44.000+02:00
Moving script request from InstallationContribution to NodeContribution
diff --git a/src/main/java/com/fzi/externalcontrol/impl/ExternalControlInstallationNodeContribution.java b/src/main/java/com/fzi/externalcontrol/impl/ExternalControlInstallationNodeContribution.java
@@ -65,8 +65,7 @@ public boolean isDefined() {
 
   @Override
   public void generateScript(ScriptWriter writer) {
-    RequestProgram sender = new RequestProgram(getHostIP(), getCustomPort());
-    urScriptProgram = sender.sendCommand("request_program\n");
+    
   }
 
   // IP helper functions
@@ -169,6 +168,10 @@ public void onOk(String value) {
   }
 
   public String getUrScriptProgram() {
+	if (urScriptProgram == "") {
+	  RequestProgram sender = new RequestProgram(getHostIP(), getCustomPort());
+	  urScriptProgram = sender.sendCommand("request_program\n");
+	}
     return urScriptProgram;
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -65,8 +65,7 @@ public boolean isDefined() {`
`65`	`65`
`66`	`66`	`@Override`
`67`	`67`	`public void generateScript(ScriptWriter writer) {`
`68`		`- RequestProgram sender = new RequestProgram(getHostIP(), getCustomPort());`
`69`		`- urScriptProgram = sender.sendCommand("request_program\n");`
	`68`	`+`
`70`	`69`	`}`
`71`	`70`
`72`	`71`	`// IP helper functions`
`@@ -169,6 +168,10 @@ public void onOk(String value) {`
`169`	`168`	`}`
`170`	`169`
`171`	`170`	`public String getUrScriptProgram() {`
	`171`	`+ if (urScriptProgram == "") {`
	`172`	`+ RequestProgram sender = new RequestProgram(getHostIP(), getCustomPort());`
	`173`	`+ urScriptProgram = sender.sendCommand("request_program\n");`
	`174`	`+ }`
`172`	`175`	`return urScriptProgram;`
`173`	`176`	`}`
`174`	`177`	`}`