Author: bpapez
Date: Tue May 15 12:26:30 2007
New Revision: 17304
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17304&repname=
=3Djahia
Log:
backport slight optimization from Jahia 5
Modified:
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/version/JahiaVers=
ionDBService.java
Modified: branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/version/Jah=
iaVersionDBService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/org/jahia/services/version/JahiaVersionDBService.java&rev=3D1=
7304&repname=3Djahia
=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
--- branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/version/JahiaVers=
ionDBService.java (original)
+++ branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/version/JahiaVers=
ionDBService.java Tue May 15 12:26:30 2007
@@ -23,6 +23,7 @@
import java.util.Vector;
=
import org.apache.log4j.Logger;
+import org.jahia.content.ContentObject;
import org.jahia.exceptions.JahiaException;
import org.jahia.params.ParamBean;
import org.jahia.registries.ServicesRegistry;
@@ -194,6 +195,14 @@
{
clientLocales.add(0, SHARED_LANG_LOCALE);
}
+ =
+ if ( !ignoreLanguage && clientLocales.size()=3D=3D1 ){
+ Locale loc =3D (Locale)clientLocales.get(0);
+ if ( loc.toString().equals(ContentObject.SHARED_LANGUAGE) ){
+ ignoreLanguage =3D true;
+ }
+ } =
+ =
ListIterator clientLocalesIter =3D clientLocales.listIterator();
=
// we want to load the active version
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
