Revision 9833
Added by Jing Tao almost 8 years ago
| CNodeService.java | ||
|---|---|---|
| 44 | 44 |
import org.dataone.client.v2.CNode; |
| 45 | 45 |
import org.dataone.client.v2.MNode; |
| 46 | 46 |
import org.dataone.client.v2.itk.D1Client; |
| 47 |
import org.dataone.exceptions.MarshallingException; |
|
| 47 | 48 |
import org.dataone.service.cn.v2.CNAuthorization; |
| 48 | 49 |
import org.dataone.service.cn.v2.CNCore; |
| 49 | 50 |
import org.dataone.service.cn.v2.CNRead; |
| ... | ... | |
| 84 | 85 |
import org.dataone.service.types.v2.ObjectFormat; |
| 85 | 86 |
import org.dataone.service.types.v2.ObjectFormatList; |
| 86 | 87 |
import org.dataone.service.types.v2.SystemMetadata; |
| 87 |
import org.dataone.service.types.v2.util.ServiceMethodRestrictionUtil; |
|
| 88 | 88 |
import org.dataone.service.util.TypeMarshaller; |
| 89 |
import org.jibx.runtime.JiBXException; |
|
| 90 | 89 |
|
| 90 |
|
|
| 91 | 91 |
import edu.ucsb.nceas.metacat.DBUtil; |
| 92 | 92 |
import edu.ucsb.nceas.metacat.EventLog; |
| 93 | 93 |
import edu.ucsb.nceas.metacat.IdentifierManager; |
| ... | ... | |
| 1251 | 1251 |
try {
|
| 1252 | 1252 |
os = new PipedOutputStream(is); |
| 1253 | 1253 |
TypeMarshaller.marshalTypeToOutputStream(objectFormatList, os); |
| 1254 |
} catch (JiBXException | IOException e) {
|
|
| 1254 |
} catch (MarshallingException | IOException e) {
|
|
| 1255 | 1255 |
throw new ServiceFailure("0000", "Unable to marshal object format list.\n" + e.getMessage());
|
| 1256 | 1256 |
} finally {
|
| 1257 | 1257 |
try {
|
Also available in: Unified diff
Replaced the JiBXException by MarshallingException.