[Treebase-guts] SF.net SVN: treebase:[1085] trunk/treebase-web/src/main/java/org/cipres/ treebase/web/controllers/TaxonSearchController.java

[<rv...@us...>]

Revision: 1085
          http://treebase.svn.sourceforge.net/treebase/?rev=1085&view=rev
Author:   rvos
Date:     2012-02-21 22:38:31 +0000 (Tue, 21 Feb 2012)
Log Message:
-----------
Defensive code against NPEs

Modified Paths:
--------------
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/TaxonSearchController.java

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/TaxonSearchController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/TaxonSearchController.java	2012-02-21 12:52:13 UTC (rev 1084)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/TaxonSearchController.java	2012-02-21 22:38:31 UTC (rev 1085)
@@ -263,16 +263,20 @@
 					}
 					if ( null != tb1LegacyId && null != index && index.matches(".*taxonVariant.*") ) {
 						TaxonVariant tv = getTaxonHome().findVariantByTB1LegacyId(tb1LegacyId);
-						LOGGER.debug("Found taxon variant: " + tv.getId());
-						if ( null != tv.getTaxon() ) {
-							taxaFound.add(tv.getTaxon());
+						if ( null != tv ) {
+							LOGGER.debug("Found taxon variant: " + tv.getId());
+							if ( null != tv.getTaxon() ) {
+								taxaFound.add(tv.getTaxon());
+							}
 						}
 					}
 					else if ( null != tb1LegacyId ){
 						Taxon taxon = getTaxonHome().findByTB1LegacyId(tb1LegacyId);
-						LOGGER.debug("Found taxon: " + taxon.getId());
 						if ( null != taxon ) {
-							taxaFound.add(taxon);
+							LOGGER.debug("Found taxon: " + taxon.getId());
+							if ( null != taxon ) {
+								taxaFound.add(taxon);
+							}
 						}
 					}					
 				}

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