UserService.registerUser(): fixed possible NPE.

Correctly handle situation when registration request was not found.

Author: php-coder

src/main/java/ru/mystamps/web/service/UserService.java

@@ -88,6 +88,10 @@ public void registerUser(final String login, final String password,
 
 		final UsersActivation activation =
 			usersActivation.findByActivationKey(activationKey);
+		if (activation == null) {
+			log.warn("Cannot find registration request for activation key '{}'", activationKey);
+			return;
+		}
 
 		final String email = activation.getEmail();
 		final Date registrationDate = activation.getCreatedAt();

src/test/java/ru/mystamps/web/service/UserServiceTest.java

@@ -34,6 +34,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.when;
 
 import ru.mystamps.web.dao.UserDao;
@@ -146,6 +147,16 @@ public void registerUserShouldDeleteRegistrationRequest() {
 		verify(usersActivationDao).delete(activation);
 	}
 
+	@Test
+	public void registerUserShouldDoNothingWhenRegistrationRequestNotFound() {
+		when(usersActivationDao.findByActivationKey(anyString())).thenReturn(null);
+		
+		service.registerUser(null, null, null, null);
+		
+		verify(userDao, never()).add(any(User.class));
+		verify(usersActivationDao, never()).delete(any(UsersActivation.class));
+	}
+	
 	@Test
 	public void registerUserShouldPassNameToDao() {
 		when(usersActivationDao.findByActivationKey(anyString())).thenReturn(getUsersActivation());