Author: solomax
Date: Wed Oct 21 04:49:15 2015
New Revision: 1709715
URL: http://svn.apache.org/viewvc?rev=1709715&view=rev
Log:
[OPENMEETINGS-1272] NPE is fixed
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/ActivatePage.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/ActivatePage.java
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/ActivatePage.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/ActivatePage.java?rev=1709715&r1=1709714&r2=1709715&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/ActivatePage.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/ActivatePage.java
Wed Oct 21 04:49:15 2015
@@ -29,20 +29,19 @@ import org.apache.wicket.request.mapper.
public class ActivatePage extends BaseNotInitedPage {
private static final long serialVersionUID = 1L;
- private final String ACTIVATION_PARAM = "u";
+ public static final String ACTIVATION_PARAM = "u";
public ActivatePage(PageParameters pp) {
String userHash = pp.get(ACTIVATION_PARAM).toString();
if (userHash != null) {
User user =
Application.getBean(UserDao.class).getUserByActivationHash(userHash);
- if (!AuthLevelUtil.hasLoginLevel(user.getRights())) {
+ if (user != null &&
!AuthLevelUtil.hasLoginLevel(user.getRights())) {
// activate
user.getRights().add(Right.Login);
user.setUpdatetime(new Date());
Application.getBean(UserDao.class).update(user,
null);
-
}
}
setResponsePage(Application.get().getSignInPageClass());
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/ActivatePage.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/ActivatePage.java?rev=1709715&r1=1709714&r2=1709715&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/ActivatePage.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/ActivatePage.java
Wed Oct 21 04:49:15 2015
@@ -29,20 +29,19 @@ import org.apache.wicket.request.mapper.
public class ActivatePage extends BaseNotInitedPage {
private static final long serialVersionUID = 1L;
- private final String ACTIVATION_PARAM = "u";
+ public static final String ACTIVATION_PARAM = "u";
public ActivatePage(PageParameters pp) {
String userHash = pp.get(ACTIVATION_PARAM).toString();
if (userHash != null) {
User user =
Application.getBean(UserDao.class).getUserByActivationHash(userHash);
- if (!AuthLevelUtil.hasLoginLevel(user.getRights())) {
+ if (user != null &&
!AuthLevelUtil.hasLoginLevel(user.getRights())) {
// activate
user.getRights().add(Right.Login);
user.setUpdated(new Date());
Application.getBean(UserDao.class).update(user,
null);
-
}
}
setResponsePage(Application.get().getSignInPageClass());
