Fix(TDI-31598): Fixing PR

main/plugins/org.talend.designer.components.localprovider/components/tAS400Connection/tAS400Connection_begin.javajet

@@ -35,5 +35,4 @@ imports="
 <%//----------------------------component codes-----------------------------------------%>
 
 	<%@ include file="../templates/DB/AbstractDBConnection.javajet"%>
-
-	globalMap.put("conn_" + "<%=cid%>",conn_<%=cid%>);
+	

main/plugins/org.talend.designer.components.localprovider/components/tAmazonMysqlConnection/tAmazonMysqlConnection_begin.javajet

@@ -44,6 +44,4 @@ imports="
 
 	<%@ include file="../templates/DB/AbstractDBConnection.javajet"%>
 
-	globalMap.put("conn_<%=cid%>",conn_<%=cid%>);
-
 	globalMap.put("db_<%=cid%>",<%=dbname%>);

main/plugins/org.talend.designer.components.localprovider/components/tAmazonOracleConnection/tAmazonOracleConnection_begin.javajet

@@ -75,6 +75,7 @@ imports="
 <%
 			}
 %>
+		globalMap.put("conn_<%=cid%>", conn_<%=cid%>);
 <%
 		}
 		
@@ -132,7 +133,6 @@ imports="
 
 	<%@ include file="../templates/DB/AbstractDBConnection.javajet"%>
 
-	globalMap.put("conn_" + "<%=cid%>",conn_<%=cid%>);
 	globalMap.put("dbschema_" + "<%=cid%>", <%=dbschema%>);
 	globalMap.put("username_" + "<%=cid%>",<%=dbuser%>);
 	globalMap.put("password_" + "<%=cid%>",dbPwd_<%=cid%>);

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseConnection/tAzureSynapseConnection_begin.javajet

@@ -65,7 +65,5 @@ imports="
 	globalMap.put("dbschema_<%=cid%>", <%=dbschema%>);
 
 	globalMap.put("db_<%=cid%>",  <%=dbname%>);
-
-	globalMap.put("conn_<%=cid%>",conn_<%=cid%>);
 	
 	globalMap.put("shareIdentitySetting_<%=cid%>",  <%=ElementParameterParser.getValue(node, "__SHARE_IDENTITY_SETTING__")%>);

main/plugins/org.talend.designer.components.localprovider/components/tDB2Connection/tDB2Connection_begin.javajet

@@ -40,7 +40,6 @@ imports="
 
 	<%@ include file="../templates/DB/AbstractDBConnection.javajet"%>
 
-	globalMap.put("conn_<%=cid%>", conn_<%=cid%>);
 	globalMap.put("host_<%=cid%>", <%=dbhost%>);
 	globalMap.put("dbname_<%=cid%>", <%=dbname%>);
 	globalMap.put("port_<%=cid%>", <%=dbport%>);

main/plugins/org.talend.designer.components.localprovider/components/tEXAConnection/tEXAConnection_begin.javajet

@@ -42,7 +42,6 @@ imports="
    // schemas are always in upper case letters
 	globalMap.put("schema_" + "<%=cid%>",<%=dbschema%>);
     // provide the connection for further usage in other components
-	globalMap.put("conn_" + "<%=cid%>",conn_<%=cid%>);
 	globalMap.put("host_" + "<%=cid%>", <%=dbhost%>); 
 	globalMap.put("port_" + "<%=cid%>", <%=dbport%>);
 	globalMap.put("username_" + "<%=cid%>", <%=dbuser%>); 

main/plugins/org.talend.designer.components.localprovider/components/tFirebirdConnection/tFirebirdConnection_begin.javajet

@@ -32,4 +32,3 @@ imports="
 
 	<%@ include file="../templates/DB/AbstractDBConnection.javajet"%>
 
-	globalMap.put("conn_" + "<%=cid%>",conn_<%=cid%>);

main/plugins/org.talend.designer.components.localprovider/components/tGreenplumConnection/tGreenplumConnection_begin.javajet

@@ -54,4 +54,3 @@ imports="
 
 	globalMap.put("schema_" + "<%=cid%>",<%=dbschema%>);
 
-	globalMap.put("conn_" + "<%=cid%>",conn_<%=cid%>);

main/plugins/org.talend.designer.components.localprovider/components/tInformixConnection/tInformixConnection_begin.javajet

@@ -60,6 +60,5 @@ imports="
 
 	<%@ include file="../templates/DB/AbstractDBConnection.javajet"%>
 
-	globalMap.put("conn_<%=cid%>",conn_<%=cid%>);
 	globalMap.put("dbschema_" + "<%=cid%>", <%=dbschema%>);
 	

main/plugins/org.talend.designer.components.localprovider/components/tIngresConnection/tIngresConnection_begin.javajet

@@ -34,4 +34,3 @@ imports="
 
 	<%@ include file="../templates/DB/AbstractDBConnection.javajet"%>
 
-	globalMap.put("conn_" + "<%=cid%>",conn_<%=cid%>);

main/plugins/org.talend.designer.components.localprovider/components/tInterbaseConnection/tInterbaseConnection_begin.javajet

@@ -31,5 +31,4 @@
 <%//----------------------------component codes-----------------------------------------%>
 
 	<%@ include file="../templates/DB/AbstractDBConnection.javajet"%>	
- 	
- 	globalMap.put("conn_" + "<%=cid%>",conn_<%=cid%>);
+

main/plugins/org.talend.designer.components.localprovider/components/tMSSqlConnection/tMSSqlConnection_begin.javajet

@@ -65,8 +65,6 @@ imports="
 	globalMap.put("dbschema_<%=cid%>", <%=dbschema%>);
 
 	globalMap.put("db_<%=cid%>",  <%=dbname%>);
-
-	globalMap.put("conn_<%=cid%>",conn_<%=cid%>);
 	
 	globalMap.put("shareIdentitySetting_<%=cid%>",  <%=ElementParameterParser.getValue(node, "__SHARE_IDENTITY_SETTING__")%>);
 

main/plugins/org.talend.designer.components.localprovider/components/tMysqlConnection/tMysqlConnection_begin.javajet

@@ -59,6 +59,4 @@ imports="
 
 	<%@ include file="../templates/DB/AbstractDBConnection.javajet"%>
 
-	globalMap.put("conn_<%=cid%>",conn_<%=cid%>);
-
 	globalMap.put("db_<%=cid%>",<%=dbname%>);

main/plugins/org.talend.designer.components.localprovider/components/tNetezzaConnection/tNetezzaConnection_begin.javajet

@@ -37,5 +37,4 @@ imports="
 
 	<%@ include file="../templates/DB/AbstractDBConnection.javajet"%>
 
-	globalMap.put("conn_<%=cid%>",conn_<%=cid%>);
 	globalMap.put("db_<%=cid%>",<%=dbname%>);

main/plugins/org.talend.designer.components.localprovider/components/tOracleConnection/tOracleConnection_begin.javajet

@@ -95,6 +95,7 @@ imports="
 <%
 			}
 %>
+		globalMap.put("conn_<%=cid%>", conn_<%=cid%>);
 <%
 		}
 
@@ -183,7 +184,6 @@ imports="
 
 	<%@ include file="../templates/DB/AbstractDBConnection.javajet"%>
 
-	globalMap.put("conn_" + "<%=cid%>",conn_<%=cid%>);
 <%
 	String connectionType = ElementParameterParser.getValue(node, "__CONNECTION_TYPE__");
 	if(("ORACLE_WALLET").equals(connectionType)&&(dbschema==null||"".equals(dbschema)||"\"\"".equals(dbschema))) {

main/plugins/org.talend.designer.components.localprovider/components/tParAccelConnection/tParAccelConnection_begin.javajet

@@ -34,4 +34,3 @@ imports="
 
 	globalMap.put("schema_" + "<%=cid%>",<%=dbschema%>);
 
-	globalMap.put("conn_" + "<%=cid%>",conn_<%=cid%>);

main/plugins/org.talend.designer.components.localprovider/components/tPostgresPlusConnection/tPostgresPlusConnection_begin.javajet

@@ -34,4 +34,3 @@ imports="
 
 	globalMap.put("schema_" + "<%=cid%>",<%=dbschema%>);
 
-	globalMap.put("conn_" + "<%=cid%>",conn_<%=cid%>);

main/plugins/org.talend.designer.components.localprovider/components/tPostgresqlConnection/tPostgresqlConnection_begin.javajet

@@ -52,5 +52,3 @@ imports="
 	<%@ include file="../templates/DB/AbstractDBConnection.javajet"%>
 
 	globalMap.put("schema_" + "<%=cid%>",<%=dbschema%>);
-
-	globalMap.put("conn_" + "<%=cid%>",conn_<%=cid%>);

main/plugins/org.talend.designer.components.localprovider/components/tRedshiftConnection/tRedshiftConnection_begin.javajet

@@ -71,4 +71,3 @@ imports="
 	<%@ include file="../templates/DB/AbstractDBConnection.javajet"%>
 	globalMap.put("schema_" + "<%=cid%>",<%=dbschema%>);
 
-	globalMap.put("conn_" + "<%=cid%>",conn_<%=cid%>);

main/plugins/org.talend.designer.components.localprovider/components/tSQLiteConnection/tSQLiteConnection_begin.javajet

@@ -33,5 +33,4 @@ imports="
 <%//----------------------------component codes-----------------------------------------%>
 
 	<%@ include file="../templates/DB/AbstractDBConnection.javajet"%>
-	
-	globalMap.put("conn_" + "<%=cid%>", conn_<%=cid%>);
+

main/plugins/org.talend.designer.components.localprovider/components/tSybaseConnection/tSybaseConnection_begin.javajet

@@ -69,7 +69,6 @@ imports="
 
 	<%@ include file="../templates/DB/AbstractDBConnection.javajet"%>
 	
-	globalMap.put("conn_<%=cid %>", conn_<%=cid %>);
 	globalMap.put("host_<%=cid%>", <%=dbhost%>);
 	globalMap.put("port_<%=cid%>", <%=dbport%>);
 	globalMap.put("db_<%=cid%>", <%=dbname%>);

main/plugins/org.talend.designer.components.localprovider/components/tTeradataConnection/tTeradataConnection_begin.javajet

@@ -44,7 +44,6 @@ imports="
 
 	<%@ include file="../templates/DB/AbstractDBConnection.javajet"%>
 
-	globalMap.put("conn_" + "<%=cid%>",conn_<%=cid%>);
 	globalMap.put("host_<%=cid%>", <%=dbhost%>);
 	globalMap.put("dbname_<%=cid%>", <%=dbname%>);
 	globalMap.put("username_<%=cid%>", dbUser_<%=cid%>);

main/plugins/org.talend.designer.components.localprovider/components/tVectorWiseConnection/tVectorWiseConnection_begin.javajet

@@ -32,4 +32,3 @@ imports="
 
 	<%@ include file="../templates/DB/AbstractDBConnection.javajet"%>
 
-	globalMap.put("conn_" + "<%=cid%>",conn_<%=cid%>);

main/plugins/org.talend.designer.components.localprovider/components/tVerticaConnection/tVerticaConnection_begin.javajet

@@ -38,6 +38,5 @@ imports="
 
 	<%@ include file="../templates/DB/AbstractDBConnection.javajet"%>
 
-	globalMap.put("conn_<%=cid%>",conn_<%=cid%>);
 	globalMap.put("dbschema_<%=cid%>", <%=dbschema%>);
 	globalMap.put("db_<%=cid%>",<%=dbname%>);

main/plugins/org.talend.designer.components.localprovider/components/templates/DB/HelpClass/HelpClass.javajet

@@ -63,7 +63,8 @@ imports="
 %>
 			String sharedConnectionName_<%=cid%> = <%=sharedConnectionName%>;
 			conn_<%=cid%> = <%=shareDBClass%>.getDBConnection("<%=this.getDirverClassName(node)%>",url_<%=cid%>,dbUser_<%=cid%> , dbPwd_<%=cid%> , sharedConnectionName_<%=cid%>);
-<%
+			globalMap.put("conn_<%=cid%>", conn_<%=cid%>);
+<%	
 		}
 		
 		public void createConnection(INode node) {