/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 7315

check for whitespace in identifiers during create() and update()
https://redmine.dataone.org/issues/3047

+            }
             Subject subject = session.getSubject();
             // do we have a valid pid?
             if (pid == null || pid.getValue().trim().equals("")) {
                 throw new InvalidRequest("1202", "The provided identifier was invalid.");
             // verify the pid is valid format
             if (isValidIdentifier(pid)) {
             	throw new InvalidRequest("1202", "The provided identifier is invalid.");
+            }
             // check for the existing identifier

+        }
         // verify the pid is valid format
         if (isValidIdentifier(pid)) {
         	throw new InvalidRequest("1202", "The provided identifier is invalid.");
+        }
         // verify that pid == SystemMetadata.getIdentifier()
         logMetacat.debug("Comparing pid|sysmeta_pid: " +
           pid.getValue() + "|" + sysmeta.getIdentifier().getValue());
-...
+      }
       /**
        * Check fro whitespace in the given pid.
        * null pids are also invalid by default
        * @param pid
        * @return
        */
       public static boolean isValidIdentifier(Identifier pid) {
     	  if (pid != null && pid.getValue() != null && pid.getValue().length() > 0) {
     		  return !pid.getValue().matches("\\s");
+    	  }
     	  return false;
+      }
       /**
        * Insert or update an XML document into Metacat
+       *
        * @param xml - the XML document to insert or update

Also available in: Unified diff