You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gc...@apache.org on 2008/05/09 20:46:07 UTC

svn commit: r654912 - /myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputLabelRenderer.java

Author: gcrawford
Date: Fri May  9 11:46:06 2008
New Revision: 654912

URL: http://svn.apache.org/viewvc?rev=654912&view=rev
Log:
TRINIDAD-1067 BlackBerry output label displays spurious message symbol

Modified:
    myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputLabelRenderer.java

Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputLabelRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputLabelRenderer.java?rev=654912&r1=654911&r2=654912&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputLabelRenderer.java (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputLabelRenderer.java Fri May  9 11:46:06 2008
@@ -472,21 +472,22 @@
     // (null == messageType || "none".equals(messageType))
     // does not meet, return true, so that caller renders the
     // span element.
-    Agent agent = arc.getAgent();
-
     if ((null != messageType) &&
         !"none".equals(messageType) ||
         ((forId != null) &&
         isInline))
     {
+      Agent agent = arc.getAgent();
+
       if ((agent != null) &&
              Agent.AGENT_BLACKBERRY.equals(agent.getAgentName()) &&
           (null == messageType || "none".equals(messageType)))
       {
         return false;
       }
+      return true;
     }
-    return true;
+    return false;
   }
 
   private PropertyKey _accessKeyKey;