git-svn-id: https://svn.coded.pt/svn/SIPRP@1671 bb69d46d-e84e-40c8-a05a-06db0d633741

trunk/AnaliseAcidentesTrabalho/src/java/utils/Utils.java

@@ -481,13 +481,17 @@ public class Utils {
 		
 		aatContext.removeAttribute( sessionID );
 
-		Map< String, Object > mapData = ( Map< String, Object > ) paContext.getAttribute( sessionID );
+		if ( paContext != null )
-		if ( mapData != null )
 		{
-			HttpSession paSession = ( HttpSession ) mapData.get( "session" );
+			Map< String, Object > mapData = ( Map< String, Object > ) paContext.getAttribute( sessionID );
-			paSession.invalidate();
+			if ( mapData != null )
+			{
+				HttpSession paSession = ( HttpSession ) mapData.get( "session" );
+				paSession.invalidate();
+			}
+			paContext.removeAttribute( sessionID );
 		}
-		paContext.removeAttribute( sessionID );
+		
 		try
 		{
 			session.invalidate();