From 94755fab8d29e911dff5ca89b9420dcbfef4dd65 Mon Sep 17 00:00:00 2001
From: Diogo Neves <deactivated@coded.pt>
Date: Wed, 4 May 2011 11:08:26 +0000
Subject: [PATCH] git-svn-id: https://svn.coded.pt/svn/SIPRP@1671
 bb69d46d-e84e-40c8-a05a-06db0d633741

---
 .../src/java/utils/Utils.java                      | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/utils/Utils.java b/trunk/AnaliseAcidentesTrabalho/src/java/utils/Utils.java
index 0074fc79..450829d3 100644
--- a/trunk/AnaliseAcidentesTrabalho/src/java/utils/Utils.java
+++ b/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 ( mapData != null )
+		if ( paContext != null )
 		{
-			HttpSession paSession = ( HttpSession ) mapData.get( "session" );
-			paSession.invalidate();
+			Map< String, Object > mapData = ( Map< String, Object > ) paContext.getAttribute( sessionID );
+			if ( mapData != null )
+			{
+				HttpSession paSession = ( HttpSession ) mapData.get( "session" );
+				paSession.invalidate();
+			}
+			paContext.removeAttribute( sessionID );
 		}
-		paContext.removeAttribute( sessionID );
+		
 		try
 		{
 			session.invalidate();