Project

General

Profile

« Previous | Next » 

Revision 7141

check for empty null (missing) node.subjectList. This should probably be a required element in the D1 schema, but it appears not. (ORNL entry was missing subjects in cn-dev environment)

View differences:

src/edu/ucsb/nceas/metacat/dataone/CNodeService.java
1122 1122
      if ( nodes != null ) {
1123 1123
        for (Node node : nodes) {
1124 1124
            
1125
            for (Subject nodeSubject : node.getSubjectList()) {
1126
                
1127
                if ( nodeSubject.equals(targetNodeSubject) ) {
1128
                    targetNode = node.getIdentifier();
1129
                    logMetacat.debug("targetNode is : " + targetNode.getValue());
1130
                    break;
1131
                }
1132
            }
1125
        	if (node.getSubjectList() != null) {
1126
        		
1127
	            for (Subject nodeSubject : node.getSubjectList()) {
1128
	            	
1129
	                if ( nodeSubject.equals(targetNodeSubject) ) {
1130
	                    targetNode = node.getIdentifier();
1131
	                    logMetacat.debug("targetNode is : " + targetNode.getValue());
1132
	                    break;
1133
	                }
1134
	            }
1135
        	}
1133 1136
            
1134 1137
            if ( targetNode != null) { break; }
1135 1138
        }

Also available in: Unified diff