DMC/scipro
7
0
Fork 0
Code Issues43 Pull Requests9 Actions Projects1 Releases Wiki Activity

nullcheck

Browse Source 
Change-Id: I7b2986759b8ddf4743bc2665ce16f7824d5d135d
This commit is contained in:
joha-asc 2011-07-20 15:03:23 +02:00
parent bab761de8f
commit eb93f544e0
1 changed files with 2 additions and 2 deletions

4
src/main/java/se/su/dsv/scipro/conference/pages/ProjectConferencePage.java

@ -48,10 +48,10 @@ public class ProjectConferencePage extends ProjectPage {
public ProjectConferencePage(PageParameters pp) {
super(pp);
String projectId = pp.getString("pid");
if (projectId == null) {
if (projectId == null && SciProSession.get().getActiveProject().getId() != null) {
projectId = String.valueOf(SciProSession.get().getActiveProject().getId());
}
if (projectId == null) {
if (projectId != null) {
final Project project = projectDao.load(Long.valueOf(projectId));
if (project == null || !projectDao.isPartOf(SciProSession.get().getUser(), project)) {
failAndRedirect();