From 31536384f9f5e38032340c162af715809f6c1301 Mon Sep 17 00:00:00 2001
From: erick.sato <erick.sato@centralit.com.br>
Date: Thu, 2 Jun 2016 08:22:28 -0300
Subject: [PATCH] Redmine #4698 Validação nullpointer grupo

---
 cit-portal-web/src/main/java/br/com/centralit/listener/StartupListener.java | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/cit-portal-web/src/main/java/br/com/centralit/listener/StartupListener.java b/cit-portal-web/src/main/java/br/com/centralit/listener/StartupListener.java
index 1ff6d5e..95a0393 100644
--- a/cit-portal-web/src/main/java/br/com/centralit/listener/StartupListener.java
+++ b/cit-portal-web/src/main/java/br/com/centralit/listener/StartupListener.java
@@ -839,13 +839,15 @@ public class StartupListener extends UtilStartup implements ApplicationListener<
 		}else{
 			boolean grupoMasterJaAddUser = false;
 			for (GrupoUsuario gpUsuario : usuario.getGrupoUsuarios()) {
-				Grupo gp = this.grupoService.getReference(gpUsuario.getGrupo().getId());
-				if(gp.getNome().equalsIgnoreCase("Administrador")){
-					if(!gp.getIsMaster()){
-						gp.setIsMaster(Boolean.TRUE);
-						this.grupoService.merge(grupo);
+				if(gpUsuario.getGrupo() != null){
+					Grupo gp = this.grupoService.getReference(gpUsuario.getGrupo().getId());
+					if(gp.getNome().equalsIgnoreCase("Administrador")){
+						if(!gp.getIsMaster()){
+							gp.setIsMaster(Boolean.TRUE);
+							this.grupoService.merge(grupo);
+						}
+						grupoMasterJaAddUser = true;
 					}
-					grupoMasterJaAddUser = true;
 				}
 			}
 			if(!grupoMasterJaAddUser){
--
libgit2 0.21.2