svn commit: [jahia] r19442 - /trunk/core/src/java/org/jahia/services/sites/JahiaSitesBaseService.java

[bpapez]

Author: bpapez
Date: Wed Jan  2 19:02:24 2008
New Revision: 19442

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19442&repname=
=3Djahia
Log:
getSite(String) =3D=3D getSiteByServerName(name), so one method simply call=
s the other now

Modified:
    trunk/core/src/java/org/jahia/services/sites/JahiaSitesBaseService.java

Modified: trunk/core/src/java/org/jahia/services/sites/JahiaSitesBaseServic=
e.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/sites/JahiaSitesBaseService.java&rev=3D19442&repname=3Dja=
hia
=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=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/services/sites/JahiaSitesBaseService.java=
 (original)
+++ trunk/core/src/java/org/jahia/services/sites/JahiaSitesBaseService.java=
 Wed Jan  2 19:02:24 2008
@@ -279,22 +279,7 @@
      * @return JahiaSite the JahiaSite bean or null
      */
     public JahiaSite getSite(String name) throws JahiaException {
-        if (name =3D=3D null) {
-            return null;
-        }
-        JahiaSite site =3D (JahiaSite) siteCacheByName.get(name);
-
-        if (site !=3D null) {
-            return site;
-        }
-
-        // try to load the site from the database.
-        site =3D siteManager.getSiteByName(name);
-        if (site !=3D null) {
-            addToCache(site);
-        }
-
-        return site;
+        return getSiteByServerName(name);
     }
 =

 =


_______________________________________________
cvs_list mailing list
cvs_list@jahia.org
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list