Merge pull request #218 from andamian/regression

Small updates to make current vostools work with new services
opencadc · Feb 13, 2024 · 7ec8735 · 7ec8735
2 parents 44470dd + b6d18cb
commit 7ec8735
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/cadc-vos-server/src/main/java/org/opencadc/vospace/server/transfers/VOSpaceTransfer.java b/cadc-vos-server/src/main/java/org/opencadc/vospace/server/transfers/VOSpaceTransfer.java
@@ -137,7 +137,8 @@ protected VOSpaceTransfer(NodePersistence per, JobUpdater jobUpdater, Job job, T
 
     void validateView()
             throws TransferException, Exception {
-        if (transfer.getView() != null && !transfer.getView().getURI().equals(VOS.VIEW_DEFAULT)) {
+        if (transfer.getView() != null && !transfer.getView().getURI().equals(VOS.VIEW_DEFAULT)
+                && !transfer.getView().getURI().equals(new URI("ivo://cadc.nrc.ca/vospace/view#data"))) {
             Views views = nodePersistence.getViews();
             View view = views.getView(transfer.getView().getURI());
             if (view == null) {

diff --git a/cadc-vos/build.gradle b/cadc-vos/build.gradle
@@ -16,7 +16,7 @@ sourceCompatibility = 1.8
 
 group = 'org.opencadc'
 
-version = '2.0.2'
+version = '2.0.3'
 
 description = 'OpenCADC VOSpace client library'
 def git_url = 'https://github.com/opencadc/vos'

diff --git a/cadc-vos/src/main/java/org/opencadc/vospace/io/NodeReader.java b/cadc-vos/src/main/java/org/opencadc/vospace/io/NodeReader.java
@@ -68,6 +68,7 @@
 package org.opencadc.vospace.io;
 
 import ca.nrc.cadc.date.DateUtil;
+import ca.nrc.cadc.util.StringUtil;
 import ca.nrc.cadc.xml.XmlUtil;
 import java.io.IOException;
 import java.io.InputStream;
@@ -481,7 +482,7 @@ protected Set<GroupURI> getGroupURIs(URI key, String delimiter, Set<NodeProperty
         Set<GroupURI> groups = new TreeSet<>();
         NodeProperty nodeProperty = getNodeProperty(key, properties);
         if (nodeProperty != null) {
-            if (nodeProperty.getValue() != null) {
+            if (StringUtil.hasText(nodeProperty.getValue())) {
                 String[] values = nodeProperty.getValue().split(delimiter);
                 for (String value : values) {
                     GroupURI groupURI;