From portal-commits at lists.jboss.org Fri Jul 18 11:12:14 2008
Content-Type: multipart/mixed; boundary="===============8620218344842621406=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r11500 -
 branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/portal.
Date: Fri, 18 Jul 2008 11:12:14 -0400
Message-ID: <E1KJrd0-00017b-1t@committer01.frg.pub.inap.atl.jboss.com>

--===============8620218344842621406==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-07-18 11:12:13 -0400 (Fri, 18 Jul 2008)
New Revision: 11500

Modified:
   branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/imp=
l/model/portal/PersistentPortalObjectContainer.java
Log:
remove ConcurrentReaderHashMap in favor of j.u.c.ConcurrentHashMap for the =
natural object id bache

Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/c=
ore/impl/model/portal/PersistentPortalObjectContainer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/im=
pl/model/portal/PersistentPortalObjectContainer.java	2008-07-18 14:53:51 UT=
C (rev 11499)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/im=
pl/model/portal/PersistentPortalObjectContainer.java	2008-07-18 15:12:13 UT=
C (rev 11500)
@@ -22,7 +22,6 @@
  *************************************************************************=
*****/
 package org.jboss.portal.core.impl.model.portal;
 =

-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
 import org.hibernate.Query;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
@@ -36,6 +35,7 @@
 import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactor=
y;
 =

 import javax.naming.InitialContext;
+import java.util.concurrent.ConcurrentHashMap;
 =

 /**
  * @author <a href=3D"mailto:julien(a)jboss.org">Julien Viet</a>
@@ -72,7 +72,7 @@
    protected ObjectContextualizer contextualizer;
 =

    /** . */
-   protected ConcurrentReaderHashMap cache;
+   protected ConcurrentHashMap cache;
 =

    /** . */
    protected boolean cacheNaturalId;
@@ -119,7 +119,7 @@
 =

       //
       contextualizer =3D new ObjectContextualizer(ctx);
-      cache =3D new ConcurrentReaderHashMap();
+      cache =3D new ConcurrentHashMap();
    }
 =

    public String getRootName()


--===============8620218344842621406==--