Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2641 permissions with large number of files #3001

Closed
wants to merge 2 commits into from
Closed

2641 permissions with large number of files #3001

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6cb4bdb
Merge branch 'develop' into 2641-permissions-with-large-number-of-files
sekmiller Feb 29, 2016
dadfd93
#2641 Catch EJB Exception
sekmiller Mar 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions src/main/java/edu/harvard/iq/dataverse/ManageFilePermissionsPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import edu.harvard.iq.dataverse.engine.command.impl.RevokeRoleCommand;
import edu.harvard.iq.dataverse.util.JsfHelper;
import static edu.harvard.iq.dataverse.util.JsfHelper.JH;
import java.io.IOException;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Date;
Expand All @@ -29,6 +30,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.ejb.EJB;
import javax.ejb.EJBException;
import javax.faces.application.FacesMessage;
import javax.faces.event.ActionEvent;
import javax.faces.view.ViewScoped;
Expand Down Expand Up @@ -242,9 +244,9 @@ public void initViewRemoveDialogByRoleAssignee(RoleAssignee ra, List<RoleAssignm

public void removeRoleAssignments() {
for (RoleAssignmentRow raRow : selectedRoleAssignmentRows) {
revokeRole(raRow.getId());
}

revokeRole(raRow.getId());
}
initMaps();
}

Expand All @@ -259,8 +261,14 @@ private void revokeRole(Long roleAssignmentId) {
} catch (CommandException ex) {
JH.addMessage(FacesMessage.SEVERITY_FATAL, "The role assignment could not be removed.");
logger.log(Level.SEVERE, "Error removing role assignment: " + ex.getMessage(), ex);
} catch (EJBException e) {
logger.log(Level.FINE, "EJB Exception removing role assignment : " + e.getMessage(), e);
//JH.addMessage(FacesMessage.SEVERITY_FATAL, "The role assignment could not be removed. EJB Exception..." + e.getMessage());
} catch (Exception e) {
JH.addMessage(FacesMessage.SEVERITY_FATAL, "The role assignment could not be removed. General Exception..." + e.getMessage());
logger.log(Level.SEVERE, "Error removing role assignment General: " + e.getMessage(), e);
}
}
}


/*
Expand Down