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/07/08 18:46:00 UTC

svn commit: r674873 - /myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MacOSSwitcherIcon.java

Author: matzew
Date: Tue Jul  8 09:45:59 2008
New Revision: 674873

URL: http://svn.apache.org/viewvc?rev=674873&view=rev
Log:
TRINIDAD-1146 - NPE from Google Bot (unknown agent)
Change order of equals(), to avoid NPE from platformName.

Modified:
    myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MacOSSwitcherIcon.java

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MacOSSwitcherIcon.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MacOSSwitcherIcon.java?rev=674873&r1=674872&r2=674873&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MacOSSwitcherIcon.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MacOSSwitcherIcon.java Tue Jul  8 09:45:59 2008
@@ -99,12 +99,11 @@
   }
 
   // Returns the Icon to use
-  private Icon _getIcon(RenderingContext arc)
+  private Icon _getIcon(RenderingContext rc)
   {
-    return (arc.getAgent().getPlatformName().equals(
-                                 Agent.PLATFORM_MACOS)) ?
-             _macOSIcon :
-             _icon;
+    return (Agent.PLATFORM_MACOS.equals(rc.getAgent().getPlatformName())) ?
+      _macOSIcon :
+      _icon;
   }
 
   private Icon _icon;