fix npe when there is no libjars

fix
Merge branch 'maintenance/7.3' of https://github.com/Talend/tcommon-studio-se into fix/TBD-12262
2021-04-14 09:07:45 +02:00 · 2021-04-13 15:12:45 +02:00 · 2021-04-13 08:50:46 +02:00 · 2021-04-09 10:03:12 +02:00 · 2021-04-09 09:40:04 +02:00 · 2021-04-07 14:53:34 +02:00
1 changed files with 11 additions and 1 deletions
--- a/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/creator/CreateMavenJobPom.java
+++ b/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/creator/CreateMavenJobPom.java
@@ -534,12 +534,22 @@ public class CreateMavenJobPom extends AbstractMavenProcessorPom {
        final Map<String, Object> templateParameters = PomUtil.getTemplateParameters(property);
        String batContent = MavenTemplateManager.getProjectSettingValue(IProjectSettingPreferenceConstants.TEMPLATE_BAT,
                templateParameters);
+        
+        String libJarsAdapted = "";
+        if (this.getWindowsScriptAddition() != null) {
+        	//we write -libjars argument to a text file to lighten the command
+        	MavenTemplateManager.saveContent(codeProject.getExternalResourcesFolder().getFile(property.getLabel() + ".txt"), this.getWindowsScriptAddition().replaceAll("-libjars ", ""), overwrite);
+        	libJarsAdapted = windowsScriptAdditionValue.toString().replaceAll(this.getWindowsScriptAddition().replaceAll("-libjars ", ""), "./" + property.getLabel() + ".txt");
+        } else {
+        	//-libjars can be null, for DI job for example
+        	libJarsAdapted = windowsScriptAdditionValue.toString();
+        }
        batContent = StringUtils
                .replaceEach(batContent,
                        new String[] { "${talend.job.jvmargs}", "${talend.job.bat.classpath}", "${talend.job.class}",
                                "${talend.job.bat.addition}" },
                        new String[] { jvmArgsStr.toString().trim(), getWindowsClasspath(), jobClass,
-                                windowsScriptAdditionValue.toString() });
+                        		libJarsAdapted });
        batContent = normalizeSpaces(batContent);

        String shContent = MavenTemplateManager.getProjectSettingValue(IProjectSettingPreferenceConstants.TEMPLATE_SH,
Author	SHA1	Message	Date
unknown	174800b724	fix npe when there is no libjars	2021-04-14 09:07:45 +02:00
unknown	883cc7ba59	fix	2021-04-13 15:12:45 +02:00
unknown	41a45abd29	Merge branch 'maintenance/7.3' of https://github.com/Talend/tcommon-studio-se into fix/TBD-12262	2021-04-13 08:50:46 +02:00
unknown	32b9688baf	refacto	2021-04-09 10:03:12 +02:00
unknown	caa26ebe54	Merge branch 'maintenance/7.3' of https://github.com/Talend/tcommon-studio-se into fix/TBD-12262	2021-04-09 09:40:04 +02:00
unknown	8d1fc7a755	Merge branch 'maintenance/7.3' of https://github.com/Talend/tcommon-studio-se into fix/TBD-12262	2021-04-07 14:53:34 +02:00
unknown	e9d34b3c30	leave as is for -cp argument	2021-04-07 14:46:55 +02:00
unknown	de48263155	reduced classpath	2021-04-06 10:49:58 +02:00
unknown	f8f9b4f553	wip	2021-04-06 10:24:28 +02:00
unknown	5d2d7b586f	Merge branch 'maintenance/7.3' of https://github.com/Talend/tcommon-studio-se into fix/TBD-12262	2021-04-06 09:31:34 +02:00
unknown	5d63374b59	fix(TBD-12262): create libjar file to be read by app	2021-04-02 16:09:06 +02:00