Merge from HEAD into WCM-DEV2. Also fixes build breakage in

jndi-client and catalina-virtual that I introduced earlier. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3393 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/jcr/session/SessionImpl.java

@@ -645,19 +645,29 @@ public class SessionImpl implements Session
         if (isLive())
         {
             // invalidate authentication
-            getRepositoryImpl().getServiceRegistry().getAuthenticationService().invalidateTicket(getTicket());
-            ticket = null;
-            
-            // clean up resources
             try
             {
-                sessionIsolation.rollback();
+                try
+                {
+                    getRepositoryImpl().getServiceRegistry().getAuthenticationService().invalidateTicket(getTicket());
+                }
+                finally
+                {
+                    try
+                    {
+                        sessionIsolation.rollback();
+                    }
+                    catch(RepositoryException e)
+                    {
+                        // continue execution and force logout
+                    }
+                }
             }
-            catch(RepositoryException e)
+            finally
             {
-                // force logout
+                ticket = null;
+                repository.deregisterSession();
             }
-            repository.deregisterSession();
         }
     }