svn commit: r542648 - /myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/CSSGenerationUtils.java

[jw...@apache.org]

Author: jwaldman
Date: Tue May 29 13:50:19 2007
New Revision: 542648

URL: http://svn.apache.org/viewvc?view=rev&rev=542648
Log:
TRINIDAD-42 If styleclass begins with .p_AF and styleclass compression is on, then nullptr exception

Modified:
    myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/CSSGenerationUtils.java

Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/CSSGenerationUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/CSSGenerationUtils.java?view=diff&rev=542648&r1=542647&r2=542648
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/CSSGenerationUtils.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/CSSGenerationUtils.java Tue May 29 13:50:19 2007
@@ -225,6 +225,8 @@
           {
             String shortSelector = _getShortSelector(mappedSelector,
                                                      shortStyleClassMap);
+            if (shortSelector == null)
+              shortSelector = mappedSelector;
 
             // run it through a shortener one more time to shorten any
             // of the af component selectors.
@@ -614,6 +616,7 @@
   // to the short version if
   // there is a short version. does not shorten styles that start with the
   // namespace
+  // returns null if it can't shorten the selector
   private static String _getShortSelector(
     String              selector,
     Map<String, String> shortStyleClassMap)