Compare commits

...

1 Commits

Author SHA1 Message Date
SunChaoqun
f6e99e54ba TESB-25024:cTalendJob with job could not be build as OSGi bundle 2019-02-21 17:55:50 +08:00

View File

@@ -72,6 +72,7 @@ import org.talend.core.repository.model.ProxyRepositoryFactory;
import org.talend.core.repository.utils.Log4jUtil;
import org.talend.core.runtime.maven.MavenUrlHelper;
import org.talend.core.runtime.process.ITalendProcessJavaProject;
import org.talend.core.runtime.process.LastGenerationInfo;
import org.talend.core.runtime.process.TalendProcessArgumentConstant;
import org.talend.core.runtime.process.TalendProcessOptionConstants;
import org.talend.core.runtime.projectsetting.ProjectPreferenceManager;
@@ -306,8 +307,21 @@ public class DefaultRunProcessService implements IRunProcessService {
break;
}
}
JobInfo mainJobInfo = LastGenerationInfo.getInstance().getLastMainJob();
boolean needOSGIProcessor = true;
if (mainJobInfo == null) {
needOSGIProcessor = false;
} else {
if (mainJobInfo.getJobId().equals(property.getId())) {
needOSGIProcessor = false;
}
}
if ("OSGI".equals(property.getAdditionalProperties().get(TalendProcessArgumentConstant.ARG_BUILD_TYPE))
|| servicePart) {
|| servicePart || needOSGIProcessor) {
if (GlobalServiceRegister.getDefault().isServiceRegistered(IESBService.class)) {
soapService = (IESBService) GlobalServiceRegister.getDefault().getService(IESBService.class);
return soapService.createOSGIJavaProcessor(process, property, filenameFromLabel);