Repository: airavata Updated Branches: refs/heads/master 1fbef2110 -> 64b7842f0
adding missing entity manager close statements Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/64b7842f Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/64b7842f Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/64b7842f Branch: refs/heads/master Commit: 64b7842f006d229598944abd7fc8f28b28e1133d Parents: 1fbef21 Author: Chathuri Wimalasena <[email protected]> Authored: Wed Aug 26 16:27:34 2015 -0400 Committer: Chathuri Wimalasena <[email protected]> Committed: Wed Aug 26 16:27:34 2015 -0400 ---------------------------------------------------------------------- .../org/apache/airavata/gfac/impl/Factory.java | 20 +------------------- .../catalog/resources/ExperimentResource.java | 1 + .../catalog/resources/ProcessResource.java | 1 + 3 files changed, 3 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/64b7842f/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/Factory.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/Factory.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/Factory.java index e660196..cec9277 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/Factory.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/Factory.java @@ -20,14 +20,12 @@ */ package org.apache.airavata.gfac.impl; -import com.google.common.eventbus.EventBus; import com.jcraft.jsch.JSch; import com.jcraft.jsch.JSchException; import com.jcraft.jsch.Session; import com.jcraft.jsch.UserInfo; import org.apache.airavata.common.exception.AiravataException; import org.apache.airavata.common.exception.ApplicationSettingsException; -import org.apache.airavata.common.utils.LocalEventPublisher; import org.apache.airavata.common.utils.ServerSettings; import org.apache.airavata.gfac.core.GFacEngine; import org.apache.airavata.gfac.core.GFacException; @@ -42,7 +40,6 @@ import org.apache.airavata.gfac.core.config.GFacYamlConfigruation; import org.apache.airavata.gfac.core.config.JobSubmitterTaskConfig; import org.apache.airavata.gfac.core.config.ResourceConfig; import org.apache.airavata.gfac.core.context.GFacContext; -import org.apache.airavata.gfac.core.context.ProcessContext; import org.apache.airavata.gfac.core.monitor.JobMonitor; import org.apache.airavata.gfac.core.scheduler.HostScheduler; import org.apache.airavata.gfac.core.task.JobSubmissionTask; @@ -50,27 +47,16 @@ import org.apache.airavata.gfac.core.task.Task; import org.apache.airavata.gfac.core.watcher.CancelRequestWatcher; import org.apache.airavata.gfac.core.watcher.RedeliveryRequestWatcher; import org.apache.airavata.gfac.impl.job.LSFJobConfiguration; -import org.apache.airavata.gfac.impl.job.LSFOutputParser; import org.apache.airavata.gfac.impl.job.PBSJobConfiguration; -import org.apache.airavata.gfac.impl.job.PBSOutputParser; import org.apache.airavata.gfac.impl.job.SlurmJobConfiguration; -import org.apache.airavata.gfac.impl.job.SlurmOutputParser; import org.apache.airavata.gfac.impl.job.UGEJobConfiguration; -import org.apache.airavata.gfac.impl.job.UGEOutputParser; import org.apache.airavata.gfac.impl.watcher.CancelRequestWatcherImpl; import org.apache.airavata.gfac.impl.watcher.RedeliveryRequestWatcherImpl; import org.apache.airavata.gfac.monitor.email.EmailBasedMonitor; import org.apache.airavata.messaging.core.Publisher; import org.apache.airavata.messaging.core.impl.RabbitMQProcessLaunchConsumer; import org.apache.airavata.messaging.core.impl.RabbitMQStatusPublisher; -import org.apache.airavata.model.appcatalog.computeresource.DataMovementProtocol; -import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionInterface; -import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol; -import org.apache.airavata.model.appcatalog.computeresource.LOCALSubmission; -import org.apache.airavata.model.appcatalog.computeresource.MonitorMode; -import org.apache.airavata.model.appcatalog.computeresource.ResourceJobManager; -import org.apache.airavata.model.appcatalog.computeresource.ResourceJobManagerType; -import org.apache.airavata.model.appcatalog.computeresource.SSHJobSubmission; +import org.apache.airavata.model.appcatalog.computeresource.*; import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory; import org.apache.airavata.registry.cpi.AppCatalog; import org.apache.airavata.registry.cpi.AppCatalogException; @@ -84,11 +70,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; -import java.util.Calendar; -import java.util.Date; import java.util.HashMap; -import java.util.List; import java.util.Map; public abstract class Factory { http://git-wip-us.apache.org/repos/asf/airavata/blob/64b7842f/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentResource.java index c32a636..ab1def4 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentResource.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentResource.java @@ -457,6 +457,7 @@ public class ExperimentResource extends AbstractExpCatResource { experiment.setEmailAddresses(emailAddresses); em.persist(experiment); em.getTransaction().commit(); + em.close(); } catch (Exception e) { logger.error(e.getMessage(), e); throw new RegistryException(e); http://git-wip-us.apache.org/repos/asf/airavata/blob/64b7842f/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessResource.java index 58b286a..51a91ce 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessResource.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessResource.java @@ -492,6 +492,7 @@ public class ProcessResource extends AbstractExpCatResource { process.setEmailAddresses(emailAddresses); em.persist(process); em.getTransaction().commit(); + em.close(); } catch (Exception e) { logger.error(e.getMessage(), e); throw new RegistryException(e);
