Revision: 508
          http://svn.sourceforge.net/stripes/?rev=508&view=rev
Author:   tfenne
Date:     2007-04-01 13:56:18 -0700 (Sun, 01 Apr 2007)

Log Message:
-----------
Merged fix for STS-354: possible NPE in OptionsCollection when an entry's label 
is null.

Modified Paths:
--------------
    
branches/1.4.x/stripes/src/net/sourceforge/stripes/tag/InputOptionsCollectionTag.java

Modified: 
branches/1.4.x/stripes/src/net/sourceforge/stripes/tag/InputOptionsCollectionTag.java
===================================================================
--- 
branches/1.4.x/stripes/src/net/sourceforge/stripes/tag/InputOptionsCollectionTag.java
       2007-04-01 20:51:03 UTC (rev 507)
+++ 
branches/1.4.x/stripes/src/net/sourceforge/stripes/tag/InputOptionsCollectionTag.java
       2007-04-01 20:56:18 UTC (rev 508)
@@ -159,7 +159,7 @@
                 }
                 if (localizedLabel != null) label = localizedLabel;
 
-                tag.setLabel(label.toString());
+                tag.setLabel(label == null ? null : label.toString());
                 tag.setValue(value);
                                try {
                        tag.doStartTag();


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development

Reply via email to