Project

General

Profile

« Previous | Next » 

Revision 6001

Added by Chris Jones about 13 years ago

DocumentImpl.delete() now throws finer grained exceptions (not a general exception). Consequently, the classes that call it have been updated to handle the thrown exceptions, including CrudService, ReplicationHandler, and ReplicationService.

View differences:

ReplicationService.java
69 69 
import edu.ucsb.nceas.metacat.accesscontrol.AccessControlForSingleFile;
70 70 
import edu.ucsb.nceas.metacat.accesscontrol.PermOrderException;
71 71 
import edu.ucsb.nceas.metacat.accesscontrol.XMLAccessDAO;
72 
import edu.ucsb.nceas.metacat.client.InsufficientKarmaException;
72 73 
import edu.ucsb.nceas.metacat.database.DBConnection;
73 74 
import edu.ucsb.nceas.metacat.database.DBConnectionPool;
74 75 
import edu.ucsb.nceas.metacat.database.DatabaseService;
......
752 753 
			EventLog.getInstance().log(request.getRemoteAddr(), REPLICATIONUSER, docid,
753 754 
					"delete");
754 755 
			logReplication.info("ReplicationService.handleForceReplicateDeleteRequest - document " + docid + " was successfully deleted ");
756 
		} catch (McdbDocNotFoundException e) {
757 
			logMetacat.error("ReplicationService.handleForceReplicateDeleteRequest - " + ReplicationService.METACAT_REPL_ERROR_MSG);
758 
			logReplication.error("document " + docid
759 
					+ " failed to delete because " + e.getMessage());
760 
			logReplication.error("ReplicationService.handleForceReplicateDeleteRequest - error: " + e.getMessage());
761 
		} catch (InsufficientKarmaException e) {
762 
			logMetacat.error("ReplicationService.handleForceReplicateDeleteRequest - " + ReplicationService.METACAT_REPL_ERROR_MSG);
763 
			logReplication.error("document " + docid
764 
					+ " failed to delete because " + e.getMessage());
765 
			logReplication.error("ReplicationService.handleForceReplicateDeleteRequest - error: " + e.getMessage());
766 
		} catch (SQLException e) {
767 
			logMetacat.error("ReplicationService.handleForceReplicateDeleteRequest - " + ReplicationService.METACAT_REPL_ERROR_MSG);
768 
			logReplication.error("document " + docid
769 
					+ " failed to delete because " + e.getMessage());
770 
			logReplication.error("ReplicationService.handleForceReplicateDeleteRequest - error: " + e.getMessage());
755 771 
		} catch (Exception e) {
756 772 
			logMetacat.error("ReplicationService.handleForceReplicateDeleteRequest - " + ReplicationService.METACAT_REPL_ERROR_MSG);
757 773 
			logReplication.error("document " + docid

Also available in: Unified diff