Revision 7139
Added by ben leinfelder over 12 years ago
| src/edu/ucsb/nceas/metacat/dataone/D1NodeService.java | ||
|---|---|---|
| 782 | 782 |
} |
| 783 | 783 |
|
| 784 | 784 |
} catch (RuntimeException e) {
|
| 785 |
e.printStackTrace(); |
|
| 785 | 786 |
// convert hazelcast RuntimeException to ServiceFailure |
| 786 | 787 |
throw new ServiceFailure("1090", "Unexpected error getting system metadata for: " +
|
| 787 | 788 |
pid.getValue()); |
| ... | ... | |
| 1456 | 1457 |
for ( Node node : nodes ) {
|
| 1457 | 1458 |
|
| 1458 | 1459 |
List<Subject> nodeSubjects = node.getSubjectList(); |
| 1459 |
|
|
| 1460 |
// check if the session subject is in the node subject list |
|
| 1461 |
for (Subject nodeSubject : nodeSubjects) {
|
|
| 1462 |
if ( nodeSubject.equals(subject) ) { // subject of session == node subject
|
|
| 1463 |
nodeList.add(node);
|
|
| 1464 |
|
|
| 1465 |
}
|
|
| 1466 |
}
|
|
| 1460 |
if (nodeSubjects != null) {
|
|
| 1461 |
// check if the session subject is in the node subject list
|
|
| 1462 |
for (Subject nodeSubject : nodeSubjects) {
|
|
| 1463 |
if ( nodeSubject.equals(subject) ) { // subject of session == node subject
|
|
| 1464 |
nodeList.add(node);
|
|
| 1465 |
} |
|
| 1466 |
}
|
|
| 1467 |
} |
|
| 1467 | 1468 |
} |
| 1468 | 1469 |
|
| 1469 | 1470 |
return nodeList; |
Also available in: Unified diff
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)