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

trunk/PlanosActuacao/src/java/utils/JSFUtils.java

@@ -110,8 +110,5 @@ public class JSFUtils {
         Map parameters = fc.getCurrentInstance().getExternalContext().getRequestParameterMap();   
         return (String) parameters.get(parameter);
     }
-    
-    
-    
 
 }

trunk/PlanosActuacao/src/java/utils/Utils.java

@@ -118,18 +118,21 @@ public class Utils {
 		ServletContext paContext = session.getServletContext();
 		ServletContext aatContext = paContext.getContext( "/AnaliseAcidentesTrabalho" );
 
-		Map< String, Object > mapData = ( Map< String, Object > ) aatContext.getAttribute( aatSessionID );
+		if ( aatContext != null && aatSessionID != null )
-		if ( mapData != null )
 		{
-			HttpSession aatSession = ( HttpSession ) mapData.get( "session" );
+			Map< String, Object > mapData = ( Map< String, Object > ) aatContext.getAttribute( aatSessionID );
-			try
+			if ( mapData != null )
 			{
-				aatSession.invalidate();
+				HttpSession aatSession = ( HttpSession ) mapData.get( "session" );
-			}
+				try
-			catch ( IllegalStateException e )
+				{
-			{
+					aatSession.invalidate();
-//				ErrorLogger.logException( e );
+				}
-				System.out.println( "Session already invalidated." );
+				catch ( IllegalStateException e )
+				{
+	//				ErrorLogger.logException( e );
+					System.out.println( "Session already invalidated." );
+				}
 			}
 		}
 	}