fix(TDI-42239): tLogCatcher and tAssertCatcher cause compilation error when used together

PATCH_RELEASE_NOTE.md

@@ -0,0 +1,57 @@
+---
+version: 6.2.1
+module: https://talend.poolparty.biz/coretaxonomy/42
+product:
+- https://talend.poolparty.biz/coretaxonomy/23
+---
+
+# TPS-3130
+
+| Info             | Value |
+| ---------------- | ---------------- |
+| Patch Name       | Patch\_20190603\_TPS-3130\_v1-6.2.1 |
+| Release Date     | 2019-06-03 |
+| Target Version   | 20160704_1411-V6.2.1 |
+| Product affected | Talend Studio |
+
+## Introduction
+
+This is a self-contained patch.
+
+**NOTE**: For information on how to obtain this patch, reach out to your Support contact at Talend.
+
+## Fixed issues
+
+This patch contains the following fixes:
+
+- TPS-3130 [6.2.1] tLogCatcher and tAssertCatcher cause compilation error when used together (TDI-42239)
+
+## Prerequisites
+
+Consider the following requirements for your system:
+
+- Talend Studio 6.2.1 must be installed.
+
+## Installation
+
+### Installing the patch using Software update
+
+1) Logon TAC and switch to Configuration->Software Update, then enter the correct values and save referring to the documentation: https://help.talend.com/reader/f7Em9WV_cPm2RRywucSN0Q/j9x5iXV~vyxMlUafnDejaQ
+
+2) Switch to Software update page, where the new patch will be listed. The patch can be downloaded from here into the nexus repository.
+
+3) On Studio Side: Logon Studio with remote mode, on the logon page the Update button is displayed: click this button to install the patch.
+
+### Installing the patch using Talend Studio
+
+1) Create a folder named "patches" under your studio installer directory and copy the patch .zip file to this folder.
+
+2) Restart your studio: a window pops up, then click OK to install the patch, or restart the commandline and the patch will be installed automatically.
+
+### Installing the patch using Commandline
+
+Execute the following commands:
+
+1. Talend-Studio-win-x86_64.exe -nosplash -application org.talend.commandline.CommandLine -consoleLog -data commandline-workspace startServer -p 8002 --talendDebug
+2. initRemote {tac_url} -ul {TAC login username} -up {TAC login password}
+3. checkAndUpdate -tu {TAC login username} -tup {TAC login password}

main/plugins/org.talend.designer.codegen/jet_stub/header.javajet

@@ -480,6 +480,7 @@ private class TalendException extends Exception {
 
 			if(!(e instanceof TDieException)){
 <%
+		boolean needCatchTalendException = false;
 		if (process.getNodesOfType("tLogCatcher").size() > 0) {
 			List<INode> logCatchers = (List<INode>)process.getNodesOfType("tLogCatcher");
 			for (INode logCatcher : logCatchers) {
@@ -511,6 +512,7 @@ private class TalendException extends Exception {
 				if (ElementParameterParser.getValue(logCatcher, "__CATCH_JAVA_EXCEPTION__").equals("true")) {
 					if(logCatcher!=virtualNCatchNode){
 					// 2) launch logCatcher subProcess
+					needCatchTalendException =  true;
 %>
 				<%=logCatcher.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
 <%
@@ -523,6 +525,7 @@ private class TalendException extends Exception {
 <%
 			}
 			if(virtualNCatchNode!=null){
+				needCatchTalendException =  true;
 %>
 				<%=virtualNCatchNode.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
 <%
@@ -536,31 +539,13 @@ private class TalendException extends Exception {
 %>
 			}
 <%
-		boolean needCatchTalendException = false;
-		if (process.getNodesOfType("tLogCatcher").size() > 0) {
-			for(INode node:process.getNodesOfType("tLogCatcher")){
-				if(ElementParameterParser.getValue(node, "__CATCH_JAVA_EXCEPTION__").equals("true")){
-					needCatchTalendException = true;
-					break;
-				}
-			}
-		}
 
-		if ((!needCatchTalendException) && (process.getNodesOfType("tAssertCatcher").size() > 0)) {
-			for(INode node:process.getNodesOfType("tAssertCatcher")){
-				if(ElementParameterParser.getValue(node, "__CATCH_JAVA_EXCEPTION__").equals("true")){
-					needCatchTalendException = true;
-					break;
-				}
-			}
-		}
 		if(needCatchTalendException) {
-			if (process.getNodesOfType("tLogCatcher").size() > 0) {
+			//TODO should catch the TalendException in assertcatcher process? but before should not work too as use java reflect, this exception can't catch
 				%>
 				} catch (TalendException e) {
 					// do nothing
 				<%
-			}
 		}
 %>
 		} catch (Exception e) {

main/plugins/org.talend.designer.components.libs/libs_src/talend-db-exasol-util/pom.xml

@@ -14,7 +14,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<talend.nexus.url>http://newbuild.talend.com:8081</talend.nexus.url>
+		<talend.nexus.url>https://artifacts-zl.talend.com</talend.nexus.url>
 	</properties>
 	
 	<distributionManagement>

main/plugins/org.talend.designer.components.libs/libs_src/talend-marketo-rest/pom.xml

@@ -15,7 +15,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<cxf.version>3.1.1</cxf.version>
-		<talend.nexus.url>http://newbuild.talend.com:8081</talend.nexus.url>
+		<talend.nexus.url>https://artifacts-zl.talend.com</talend.nexus.url>
 	</properties>
 	
 	<distributionManagement>

pom.xml

@@ -18,7 +18,7 @@
 			<snapshots>
 				<enabled>false</enabled>
 			</snapshots>
-			<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceRelease/</url>
+			<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</url>
 		</repository>
 		<repository>
 			<id>talend_open_snapshots</id>
@@ -28,7 +28,7 @@
 			<snapshots>
 				<enabled>true</enabled>
 			</snapshots>
-			<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
+			<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
 		</repository>
 	</repositories>
 	<modules>