From 162ef0aaec2fa182071a99bb984603650559a9bf Mon Sep 17 00:00:00 2001
From: Kevin Roast <kevin.roast@alfresco.com>
Date: Mon, 19 Oct 2009 15:30:46 +0000
Subject: [PATCH] Merged V3.2 to HEAD    17029: Merged V3.1 to V3.2      
 17026: Fix for ETWOTWO-1158 - login.jsp does no longer redirects
 authenticated users.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17030 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../web/bean/repository/Preferences.java      | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/source/java/org/alfresco/web/bean/repository/Preferences.java b/source/java/org/alfresco/web/bean/repository/Preferences.java
index f5f258a0ef..1924d7302f 100644
--- a/source/java/org/alfresco/web/bean/repository/Preferences.java
+++ b/source/java/org/alfresco/web/bean/repository/Preferences.java
@@ -24,13 +24,12 @@
  */
 package org.alfresco.web.bean.repository;
 
-import java.io.IOException;
-import java.io.ObjectInputStream;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
 import javax.faces.context.FacesContext;
+import javax.transaction.UserTransaction;
 
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
@@ -91,10 +90,27 @@ public final class Preferences implements Serializable
    public void setValue(String name, Serializable value)
    {
       QName qname = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, name);
+      
       // persist the property to the repo
-      getNodeService().setProperty(this.preferencesRef, qname, value);
-      // update the cache
-      this.cache.put(name, value);
+      UserTransaction tx = null;
+      try
+      {
+         FacesContext context = FacesContext.getCurrentInstance();
+         tx = Repository.getUserTransaction(context, true);
+         tx.begin();
+         
+         getNodeService().setProperty(this.preferencesRef, qname, value);
+         
+         tx.commit();
+         
+         // update the cache
+         this.cache.put(name, value);
+      }
+      catch (Throwable err)
+      {
+         // we cannot update the properties if a user is no longer authenticated
+         try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
+      }
    }
    
    /**