/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 6777

updated D1 API -- removed Permission.REPLICATE and associated parameters

             boolean result = false;
             Subject targetNodeSubject = new Subject();
             String nodeSubject = null;
             Permission permission = null;
             String replPermission = null;
             // get the pid
-...
+            }
             // get the permission
             try {
                 replPermission = params.get("replicatePermission")[0];
                 permission = Permission.convert(replPermission);
             result = CNodeService.getInstance(request).isNodeAuthorized(session, targetNodeSubject, identifier);
             } catch (NullPointerException e) {
                 String msg = "The 'replicatePermission' must be provided as a parameter and was not.";
                 logMetacat.error(msg);
                 throw new InvalidRequest("4873", msg);
+            }
             result = CNodeService.getInstance(request).isNodeAuthorized(session,
                     targetNodeSubject, identifier, permission);
             response.setStatus(200);
             response.setContentType("text/xml");
             return result;

             // check for authorization to replicate, null session to act as this source MN
             try {
                 allowed = D1Client.getCN().isNodeAuthorized(null, targetNodeSubject, pid, null);
                 allowed = D1Client.getCN().isNodeAuthorized(null, targetNodeSubject, pid);
             } catch (InvalidToken e1) {
                 throw new ServiceFailure("2181", "Could not determine if node is authorized: "
                     + e1.getMessage());

        */
       @Override
       public boolean isNodeAuthorized(Session originatingNodeSession,
         Subject targetNodeSubject, Identifier pid, Permission replicatePermission)
         Subject targetNodeSubject, Identifier pid)
         throws NotImplemented, NotAuthorized, InvalidToken, ServiceFailure,
         NotFound, InvalidRequest {

Also available in: Unified diff