Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d8623410 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d8623410 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d8623410 Branch: refs/heads/master Commit: d86234106e6845342b81c1edbfcddeb4a661dd20 Parents: 3216381 a2823bc Author: Chathuri Wimalasena <[email protected]> Authored: Tue Sep 29 10:54:42 2015 -0400 Committer: Chathuri Wimalasena <[email protected]> Committed: Tue Sep 29 10:54:42 2015 -0400 ---------------------------------------------------------------------- .../experiment/catalog/resources/ProcessOutputResource.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/d8623410/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessOutputResource.java ---------------------------------------------------------------------- diff --cc modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessOutputResource.java index 23ed242,0b56cd1..de93b63 --- 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 @@@ -153,10 -153,12 +153,11 @@@ public class ProcessOutputResource exte public void save() throws RegistryException{ EntityManager em = null; try { - if(processId == null){ - throw new RegistryException("Does not have the process id"); + if (processId == null || outputName == null) { + throw new RegistryException("Primary keys must have not null values. ProcessId:" + processId + + " OutputName:" + outputName); } em = ExpCatResourceUtils.getEntityManager(); - ProcessOutput processOutput; ProcessOutputPK processOutputPK = new ProcessOutputPK(); processOutputPK.setProcessId(processId);
