Repository: airavata Updated Branches: refs/heads/master 303630d32 -> ea0fb5229
fixing possible JPA issues with entity manager Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ea0fb522 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ea0fb522 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ea0fb522 Branch: refs/heads/master Commit: ea0fb52294ee3e3375f33fb16fc290dcb5d33e90 Parents: 303630d Author: Chathuri Wimalasena <[email protected]> Authored: Thu Sep 17 14:31:49 2015 -0400 Committer: Chathuri Wimalasena <[email protected]> Committed: Thu Sep 17 14:31:49 2015 -0400 ---------------------------------------------------------------------- .../org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java | 1 + .../experiment/catalog/resources/ExperimentInputResource.java | 2 +- .../experiment/catalog/resources/ExperimentOutputResource.java | 2 +- .../core/experiment/catalog/resources/ExperimentResource.java | 2 +- .../registry/core/experiment/catalog/resources/JobResource.java | 2 +- .../core/experiment/catalog/resources/JobStatusResource.java | 2 +- .../core/experiment/catalog/resources/ProcessErrorResource.java | 3 ++- .../core/experiment/catalog/resources/ProcessInputResource.java | 3 ++- .../core/experiment/catalog/resources/ProcessOutputResource.java | 3 ++- .../core/experiment/catalog/resources/ProcessResource.java | 3 ++- .../catalog/resources/ProcessResourceScheduleResource.java | 3 ++- .../core/experiment/catalog/resources/ProcessStatusResource.java | 3 ++- .../core/experiment/catalog/resources/TaskErrorResource.java | 3 ++- .../registry/core/experiment/catalog/resources/TaskResource.java | 3 ++- .../core/experiment/catalog/resources/TaskStatusResource.java | 3 ++- .../catalog/resources/UserConfigurationDataResource.java | 3 ++- 16 files changed, 26 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/ea0fb522/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java index dd15cfa..396a6e5 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java @@ -185,6 +185,7 @@ public class EmailBasedMonitor implements JobMonitor, Runnable{ } } catch (MessagingException e) { log.error("[EJM]: Couldn't connect to the store ", e); + // we should retry } catch (InterruptedException e) { log.error("[EJM]: Interrupt exception while sleep ", e); } catch (AiravataException e) { http://git-wip-us.apache.org/repos/asf/airavata/blob/ea0fb522/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentInputResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentInputResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentInputResource.java index 56e3128..e5dfa3f 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentInputResource.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentInputResource.java @@ -172,7 +172,6 @@ public class ExperimentInputResource extends AbstractExpCatResource { EntityManager em = null; try { em = ExpCatResourceUtils.getEntityManager(); - em.getTransaction().begin(); if(experimentId == null){ throw new RegistryException("Does not have the experiment id"); } @@ -196,6 +195,7 @@ public class ExperimentInputResource extends AbstractExpCatResource { experimentInput.setIsRequired(isRequired); experimentInput.setRequiredToAddedToCmd(requiredToAddedToCmd); experimentInput.setDataStaged(dataStaged); + em.getTransaction().begin(); em.persist(experimentInput); em.getTransaction().commit(); em.close(); http://git-wip-us.apache.org/repos/asf/airavata/blob/ea0fb522/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentOutputResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentOutputResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentOutputResource.java index 1d4b06c..b554174 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentOutputResource.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentOutputResource.java @@ -154,7 +154,6 @@ public class ExperimentOutputResource extends AbstractExpCatResource { EntityManager em = null; try { em = ExpCatResourceUtils.getEntityManager(); - em.getTransaction().begin(); if(experimentId == null){ throw new RegistryException("Does not have the experiment id"); } @@ -176,6 +175,7 @@ public class ExperimentOutputResource extends AbstractExpCatResource { experimentOutput.setDataMovement(dataMovement); experimentOutput.setLocation(location); experimentOutput.setSearchQuery(searchQuery); + em.getTransaction().begin(); em.persist(experimentOutput); em.getTransaction().commit(); em.close(); http://git-wip-us.apache.org/repos/asf/airavata/blob/ea0fb522/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 f60ff0a..68f40c5 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 @@ -436,7 +436,6 @@ public class ExperimentResource extends AbstractExpCatResource { EntityManager em = null; try { em = ExpCatResourceUtils.getEntityManager(); - em.getTransaction().begin(); Experiment experiment = em.find(Experiment.class, experimentId); if (experiment == null) { experiment = new Experiment(); @@ -453,6 +452,7 @@ public class ExperimentResource extends AbstractExpCatResource { experiment.setGatewayExecutionId(gatewayExecutionId); experiment.setEnableEmailNotification(enableEmailNotification); experiment.setEmailAddresses(emailAddresses); + em.getTransaction().begin(); em.persist(experiment); em.getTransaction().commit(); em.close(); http://git-wip-us.apache.org/repos/asf/airavata/blob/ea0fb522/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobResource.java index 644fef0..7fe29d3 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobResource.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobResource.java @@ -274,7 +274,6 @@ public class JobResource extends AbstractExpCatResource { EntityManager em = null; try { em = ExpCatResourceUtils.getEntityManager(); - em.getTransaction().begin(); JobPK jobPK = new JobPK(); jobPK.setJobId(jobId); jobPK.setProcessId(processId); @@ -299,6 +298,7 @@ public class JobResource extends AbstractExpCatResource { job.setJobName(jobName); job.setWorkingDir(workingDir); job.setExitCode(exitCode); + em.getTransaction().begin(); em.persist(job); em.getTransaction().commit(); em.close(); http://git-wip-us.apache.org/repos/asf/airavata/blob/ea0fb522/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobStatusResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobStatusResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobStatusResource.java index ded56b4..c2ff7a5 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobStatusResource.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobStatusResource.java @@ -122,7 +122,6 @@ public class JobStatusResource extends AbstractExpCatResource { throw new RegistryException("Does not have the job id or status id or task id"); } em = ExpCatResourceUtils.getEntityManager(); - em.getTransaction().begin(); JobStatus jobStatus; JobStatusPK jobStatusPK = new JobStatusPK(); jobStatusPK.setJobId(jobId); @@ -137,6 +136,7 @@ public class JobStatusResource extends AbstractExpCatResource { jobStatus.setProcessId(processId); jobStatus.setState(state); jobStatus.setReason(reason); + em.getTransaction().begin(); em.persist(jobStatus); em.getTransaction().commit(); em.close(); http://git-wip-us.apache.org/repos/asf/airavata/blob/ea0fb522/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessErrorResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessErrorResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessErrorResource.java index 6a7f045..a7ba797 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessErrorResource.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessErrorResource.java @@ -131,7 +131,7 @@ public class ProcessErrorResource extends AbstractExpCatResource { throw new RegistryException("Does not have the process id or error id"); } em = ExpCatResourceUtils.getEntityManager(); - em.getTransaction().begin(); + ProcessError processError; ProcessErrorPK processErrorPK = new ProcessErrorPK(); processErrorPK.setProcessId(processId); @@ -147,6 +147,7 @@ public class ProcessErrorResource extends AbstractExpCatResource { processError.setRootCauseErrorIdList(rootCauseErrorIdList); processError.setTransientOrPersistent(transientOrPersistent); em.persist(processError); + em.getTransaction().begin(); em.getTransaction().commit(); em.close(); } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/airavata/blob/ea0fb522/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessInputResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessInputResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessInputResource.java index 823ec2b..eec4878 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessInputResource.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessInputResource.java @@ -175,7 +175,7 @@ public class ProcessInputResource extends AbstractExpCatResource { throw new RegistryException("Does not have the process id"); } em = ExpCatResourceUtils.getEntityManager(); - em.getTransaction().begin(); + ProcessInput processInput; ProcessInputPK processInputPk = new ProcessInputPK(); processInputPk.setProcessId(processId); @@ -196,6 +196,7 @@ public class ProcessInputResource extends AbstractExpCatResource { processInput.setIsRequired(isRequired); processInput.setRequiredToAddedToCmd(requiredToAddedToCmd); processInput.setDataStaged(dataStaged); + em.getTransaction().begin(); em.persist(processInput); em.getTransaction().commit(); em.close(); http://git-wip-us.apache.org/repos/asf/airavata/blob/ea0fb522/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessOutputResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessOutputResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessOutputResource.java index 8e930ac..b1953b6 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessOutputResource.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessOutputResource.java @@ -157,7 +157,7 @@ public class ProcessOutputResource extends AbstractExpCatResource { throw new RegistryException("Does not have the process id"); } em = ExpCatResourceUtils.getEntityManager(); - em.getTransaction().begin(); + ProcessOutput processOutput; ProcessOutputPK processOutputPK = new ProcessOutputPK(); processOutputPK.setProcessId(processId); @@ -176,6 +176,7 @@ public class ProcessOutputResource extends AbstractExpCatResource { processOutput.setDataMovement(dataMovement); processOutput.setLocation(location); processOutput.setSearchQuery(searchQuery); + em.getTransaction().begin(); em.persist(processOutput); em.getTransaction().commit(); em.close(); http://git-wip-us.apache.org/repos/asf/airavata/blob/ea0fb522/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 9adb7dc..5aa8324 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 @@ -471,7 +471,7 @@ public class ProcessResource extends AbstractExpCatResource { EntityManager em = null; try { em = ExpCatResourceUtils.getEntityManager(); - em.getTransaction().begin(); + Process process = em.find(Process.class, processId); if (process == null) { process = new Process(); @@ -488,6 +488,7 @@ public class ProcessResource extends AbstractExpCatResource { process.setGatewayExecutionId(gatewayExecutionId); process.setEnableEmailNotification(enableEmailNotification); process.setEmailAddresses(emailAddresses); + em.getTransaction().begin(); em.persist(process); em.getTransaction().commit(); em.close(); http://git-wip-us.apache.org/repos/asf/airavata/blob/ea0fb522/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessResourceScheduleResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessResourceScheduleResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessResourceScheduleResource.java index c510305..65ac551 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessResourceScheduleResource.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessResourceScheduleResource.java @@ -138,7 +138,7 @@ public class ProcessResourceScheduleResource extends AbstractExpCatResource { throw new RegistryException("Does not have the process id"); } em = ExpCatResourceUtils.getEntityManager(); - em.getTransaction().begin(); + ProcessResourceSchedule processResourceSchedule; processResourceSchedule = em.find(ProcessResourceSchedule.class, processId); if(processResourceSchedule == null){ @@ -152,6 +152,7 @@ public class ProcessResourceScheduleResource extends AbstractExpCatResource { processResourceSchedule.setQueueName(queueName); processResourceSchedule.setWallTimeLimit(wallTimeLimit); processResourceSchedule.setTotalPhysicalMemory(totalPhysicalMemory); + em.getTransaction().begin(); em.persist(processResourceSchedule); em.getTransaction().commit(); em.close(); http://git-wip-us.apache.org/repos/asf/airavata/blob/ea0fb522/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessStatusResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessStatusResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessStatusResource.java index 53eba4f..894e95b 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessStatusResource.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessStatusResource.java @@ -113,7 +113,7 @@ public class ProcessStatusResource extends AbstractExpCatResource { throw new RegistryException("Does not have the process id or status id"); } em = ExpCatResourceUtils.getEntityManager(); - em.getTransaction().begin(); + ProcessStatus processStatus; ProcessStatusPK processStatusPK = new ProcessStatusPK(); processStatusPK.setStatusId(statusId); @@ -126,6 +126,7 @@ public class ProcessStatusResource extends AbstractExpCatResource { processStatus.setProcessId(processId); processStatus.setState(state); processStatus.setReason(reason); + em.getTransaction().begin(); em.persist(processStatus); em.getTransaction().commit(); em.close(); http://git-wip-us.apache.org/repos/asf/airavata/blob/ea0fb522/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/TaskErrorResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/TaskErrorResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/TaskErrorResource.java index 9e01601..d93712e 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/TaskErrorResource.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/TaskErrorResource.java @@ -128,7 +128,7 @@ public class TaskErrorResource extends AbstractExpCatResource { EntityManager em = null; try { em = ExpCatResourceUtils.getEntityManager(); - em.getTransaction().begin(); + TaskError taskError; if(taskId == null || errorId == null){ throw new RegistryException("Does not have the task id or error id"); @@ -147,6 +147,7 @@ public class TaskErrorResource extends AbstractExpCatResource { taskError.setUserFriendlyMessage(userFriendlyMessage); taskError.setRootCauseErrorIdList(rootCauseErrorIdList); taskError.setTransientOrPersistent(transientOrPersistent); + em.getTransaction().begin(); em.persist(taskError); em.getTransaction().commit(); em.close(); http://git-wip-us.apache.org/repos/asf/airavata/blob/ea0fb522/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/TaskResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/TaskResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/TaskResource.java index ad3de43..d480597 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/TaskResource.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/TaskResource.java @@ -274,7 +274,7 @@ public class TaskResource extends AbstractExpCatResource { EntityManager em = null; try { em = ExpCatResourceUtils.getEntityManager(); - em.getTransaction().begin(); + Task task = em.find(Task.class, taskId); if(task == null){ task = new Task(); @@ -286,6 +286,7 @@ public class TaskResource extends AbstractExpCatResource { task.setLastUpdateTime(lastUpdateTime); task.setTaskDetail(taskDetail); task.setSetSubTaskModel(subTaskModel); + em.getTransaction().begin(); em.persist(task); em.getTransaction().commit(); em.close(); http://git-wip-us.apache.org/repos/asf/airavata/blob/ea0fb522/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/TaskStatusResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/TaskStatusResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/TaskStatusResource.java index 4f4ff7a..8f8f31f 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/TaskStatusResource.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/TaskStatusResource.java @@ -110,7 +110,7 @@ public class TaskStatusResource extends AbstractExpCatResource { EntityManager em = null; try { em = ExpCatResourceUtils.getEntityManager(); - em.getTransaction().begin(); + TaskStatus taskStatus; if(taskId == null || statusId == null){ throw new RegistryException("Does not have the task id or status id"); @@ -127,6 +127,7 @@ public class TaskStatusResource extends AbstractExpCatResource { taskStatus.setState(state); taskStatus.setReason(reason); taskStatus.setTimeOfStateChange(timeOfStateChange); + em.getTransaction().begin(); em.persist(taskStatus); em.getTransaction().commit(); em.close(); http://git-wip-us.apache.org/repos/asf/airavata/blob/ea0fb522/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/UserConfigurationDataResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/UserConfigurationDataResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/UserConfigurationDataResource.java index 0ee986a..49c9de3 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/UserConfigurationDataResource.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/UserConfigurationDataResource.java @@ -189,7 +189,7 @@ public class UserConfigurationDataResource extends AbstractExpCatResource { EntityManager em = null; try { em = ExpCatResourceUtils.getEntityManager(); - em.getTransaction().begin(); + UserConfigurationData userConfigurationData; if(experimentId == null){ throw new RegistryException("Does not have the experiment id"); @@ -212,6 +212,7 @@ public class UserConfigurationDataResource extends AbstractExpCatResource { userConfigurationData.setQueueName(queueName); userConfigurationData.setWallTimeLimit(wallTimeLimit); userConfigurationData.setTotalPhysicalMemory(totalPhysicalMemory); + em.getTransaction().begin(); em.persist(userConfigurationData); em.getTransaction().commit(); em.close();
