This will still crash if rc.getAgent() ever returns null. I don't know if that's a possibility.
On 7/8/08, [EMAIL PROTECTED] <[EMAIL PROTECTED]> wrote: > Author: matzew > Date: Tue Jul 8 09:41:52 2008 > New Revision: 674871 > > URL: http://svn.apache.org/viewvc?rev=674871&view=rev > Log: > TRINIDAD-1146 - NPE from Google Bot (unknown agent) > Change order of equals(), to avoid NPE from platformName. > > Modified: > > myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MacOSSwitcherIcon.java > > Modified: > myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MacOSSwitcherIcon.java > URL: > http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MacOSSwitcherIcon.java?rev=674871&r1=674870&r2=674871&view=diff > > ============================================================================== > --- > myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MacOSSwitcherIcon.java > (original) > +++ > myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MacOSSwitcherIcon.java > Tue Jul 8 09:41:52 2008 > @@ -101,10 +101,9 @@ > // Returns the Icon to use > private Icon _getIcon(RenderingContext arc) > { > - return (arc.getAgent().getPlatformName().equals( > - Agent.PLATFORM_MACOS)) ? > - _macOSIcon : > - _icon; > + return (Agent.PLATFORM_MACOS.equals(arc.getAgent().getPlatformName())) ? > + _macOSIcon : > + _icon; > } > > private Icon _icon; > > >
