You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2008/10/03 19:57:08 UTC

svn commit: r701469 - /myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNode.java

Author: matzew
Date: Fri Oct  3 10:57:08 2008
New Revision: 701469

URL: http://svn.apache.org/viewvc?rev=701469&view=rev
Log:
TRINIDAD-1247 - org.apache.myfaces.trinidadinternal.skin.RequestSkinWrapper.getStyleSheetDocumentId has very poor performance

Thx to Stevan for his patch

Modified:
    myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNode.java

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNode.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNode.java?rev=701469&r1=701468&r2=701469&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNode.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNode.java Fri Oct  3 10:57:08 2008
@@ -218,9 +218,8 @@
       return 0;
 
     int browser = agent.getAgentApplication();
-    Version version = new Version(agent.getAgentVersion());
     
-    int browserAndVersionMatch = _compareBrowserAndVersion(browser, version);
+    int browserAndVersionMatch = _compareBrowserAndVersion(browser, agent);
     if (browserAndVersionMatch == 0)
       return 0;
     int modeMatch = _compareMode(mode);
@@ -386,7 +385,7 @@
   }
 
   //Compares the browser and its version against the supported variants
-  private int _compareBrowserAndVersion(int browser, Version version)
+  private int _compareBrowserAndVersion(int browser, TrinidadAgent agent)
   {
     // If we don't have a browser specified, we match anything
     if (_agentVersions.isEmpty())
@@ -405,6 +404,8 @@
       if (versions.isEmpty())
         return _BROWSER_EXACT_MATCH | _VERSION_UNKNOWN_MATCH;
       
+      Version version = new Version(agent.getAgentVersion());
+        
       for (Version av : versions)
       {
         if (av.compareTo(version) == 0)