optional retrievedFrom

Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/4f0421a6
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/4f0421a6
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/4f0421a6

Branch: refs/heads/master
Commit: 4f0421a646a40d351dd340f7114981cde1312cb2
Parents: 91a0214
Author: Stian Soiland-Reyes <[email protected]>
Authored: Thu Feb 23 14:35:49 2017 +0000
Committer: Stian Soiland-Reyes <[email protected]>
Committed: Thu Feb 23 14:35:49 2017 +0000

----------------------------------------------------------------------
 .../robundle/manifest/RDFToManifest.java        | 24 ++++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/4f0421a6/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/RDFToManifest.java
----------------------------------------------------------------------
diff --git 
a/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/RDFToManifest.java
 
b/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/RDFToManifest.java
index b758244..6b8ef97 100644
--- 
a/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/RDFToManifest.java
+++ 
b/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/RDFToManifest.java
@@ -436,11 +436,13 @@ public class RDFToManifest {
 
                // retrievedFrom
                RDFNode retrievedNode = ro.getPropertyValue(retrievedFrom);
-               try {
-                       manifest.setRetrievedFrom(new 
URI(retrievedNode.asResource().getURI()));
-               } catch (URISyntaxException ex) {
-                       logger.log(Level.WARNING, "Error creating URI for 
retrievedFrom: " +
-                                       retrievedNode.asResource().getURI(), 
ex);
+               if (retrievedNode != null) {
+               try {
+                       manifest.setRetrievedFrom(new 
URI(retrievedNode.asResource().getURI()));
+               } catch (URISyntaxException ex) {
+                       logger.log(Level.WARNING, "Error creating URI for 
retrievedFrom: " +
+                                       retrievedNode.asResource().getURI(), 
ex);
+               }
                }
 
                // retrievedBy
@@ -504,11 +506,13 @@ public class RDFToManifest {
 
                        // retrievedFrom
                        RDFNode retrievedAggrNode = 
aggrResource.getPropertyValue(retrievedFrom);
-                       try {
-                               meta.setRetrievedFrom(new 
URI(retrievedAggrNode.asResource().getURI()));
-                       } catch (URISyntaxException ex) {
-                               logger.log(Level.WARNING, "Error creating URI 
for retrievedFrom: " +
-                                               
retrievedAggrNode.asResource().getURI(), ex);
+                       if (retrievedAggrNode != null) {
+                       try {
+                               meta.setRetrievedFrom(new 
URI(retrievedAggrNode.asResource().getURI()));
+                       } catch (URISyntaxException ex) {
+                               logger.log(Level.WARNING, "Error creating URI 
for retrievedFrom: " +
+                                               
retrievedAggrNode.asResource().getURI(), ex);
+                       }
                        }
 
                        // retrievedBy

Reply via email to