[gatein-commits] gatein SVN: r1991 - in portal/trunk/component/portal/src: test/java/org/exoplatform/portal/config and 1 other directory.

[do-not-reply at jboss.org]

Author: julien_viet
Date: 2010-03-04 18:20:00 -0500 (Thu, 04 Mar 2010)
New Revision: 1991

Modified:
   portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/DataCache.java
   portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestUserPortalConfigService.java
Log:
fixing failing unit test that I made fail in previous commits


Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/DataCache.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/DataCache.java	2010-03-04 22:56:10 UTC (rev 1990)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/DataCache.java	2010-03-04 23:20:00 UTC (rev 1991)
@@ -126,14 +126,17 @@
             v = super.execute(session, task);
 
             //
-            if (v == null)
+            if (!session.isModified())
             {
-               session.putInCache(key, NullObject.get());
+               if (v == null)
+               {
+                  session.putInCache(key, NullObject.get());
+               }
+               else
+               {
+                  session.putInCache(key, v);
+               }
             }
-            else
-            {
-               session.putInCache(key, v);
-            }
 
             //
             return v;

Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestUserPortalConfigService.java
===================================================================
--- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestUserPortalConfigService.java	2010-03-04 22:56:10 UTC (rev 1990)
+++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestUserPortalConfigService.java	2010-03-04 23:20:00 UTC (rev 1991)
@@ -935,27 +935,28 @@
          //
          if (failure == null)
          {
+            // Clear cache for test
+            mgr.clearCache();
+
+            //
             mopSession = mgr.openSession();
-            if (failure == null)
+
+            //
+            ConversationState.setCurrent(conversationState);
+            try
             {
-               ConversationState.setCurrent(conversationState);
-               try
-               {
-
-                  //
-                  execute();
-               }
-               catch (Exception e)
-               {
-                  failure = e;
-               }
-               finally
-               {
-                  ConversationState.setCurrent(null);
-                  mopSession.close(false);
-                  end();
-               }
+               execute();
             }
+            catch (Exception e)
+            {
+               failure = e;
+            }
+            finally
+            {
+               ConversationState.setCurrent(null);
+               mopSession.close(false);
+               end();
+            }
          }
 
          // Report error as a junit assertion failure