Revision 9170
Added by Jing Tao over 9 years ago
| src/edu/ucsb/nceas/metacat/dataone/CNodeService.java | ||
|---|---|---|
| 1189 | 1189 |
} |
| 1190 | 1190 |
|
| 1191 | 1191 |
//check if the sid is legitimate in the system metadata |
| 1192 |
checkSidInModifyingSystemMetadata(sysmeta, "4864", "4862"); |
|
| 1192 |
//checkSidInModifyingSystemMetadata(sysmeta, "4864", "4862"); |
|
| 1193 |
Identifier sid = sysmeta.getSeriesId(); |
|
| 1194 |
if(sid != null) {
|
|
| 1195 |
if (!isValidIdentifier(sid)) {
|
|
| 1196 |
throw new InvalidRequest("4863", "The series id in the system metadata is invalid in the request.");
|
|
| 1197 |
} |
|
| 1198 |
} |
|
| 1193 | 1199 |
|
| 1194 | 1200 |
try {
|
| 1195 | 1201 |
lock = HazelcastService.getInstance().getLock(sysmeta.getIdentifier().getValue()); |
| ... | ... | |
| 1586 | 1592 |
// proceed if we're called by a CN |
| 1587 | 1593 |
if ( isAllowed ) {
|
| 1588 | 1594 |
//check if the series id is legitimate. It uses the same rules of the method registerSystemMetadata |
| 1589 |
checkSidInModifyingSystemMetadata(sysmeta, "4896", "4893"); |
|
| 1595 |
//checkSidInModifyingSystemMetadata(sysmeta, "4896", "4893"); |
|
| 1596 |
Identifier sid = sysmeta.getSeriesId(); |
|
| 1597 |
if(sid != null) {
|
|
| 1598 |
if (!isValidIdentifier(sid)) {
|
|
| 1599 |
throw new InvalidRequest("4891", "The series id in the system metadata is invalid in the request.");
|
|
| 1600 |
} |
|
| 1601 |
} |
|
| 1590 | 1602 |
// create the coordinating node version of the document |
| 1591 | 1603 |
logMetacat.debug("Locked identifier " + pid.getValue());
|
| 1592 | 1604 |
sysmeta.setSerialVersion(BigInteger.ONE); |
Also available in: Unified diff
Remove the code to check sid on create and registerSystemMetadata.