[Treebase-guts] SF.net SVN: treebase:[410] trunk/treebase-core/src/main/java/org/cipres/ treebase/service/study/SubmissionServiceImpl.java

[<yo...@us...>]

Revision: 410
          http://treebase.svn.sourceforge.net/treebase/?rev=410&view=rev
Author:   youjun
Date:     2010-01-08 01:08:41 +0000 (Fri, 08 Jan 2010)

Log Message:
-----------
add condition to avoid null pointer

Modified Paths:
--------------
    trunk/treebase-core/src/main/java/org/cipres/treebase/service/study/SubmissionServiceImpl.java

Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/service/study/SubmissionServiceImpl.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/service/study/SubmissionServiceImpl.java	2010-01-07 20:58:03 UTC (rev 409)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/service/study/SubmissionServiceImpl.java	2010-01-08 01:08:41 UTC (rev 410)
@@ -607,7 +607,7 @@
 				// }
 			} finally {
 				// Dispose the mesquite project after all usage:
-				if (dataSet != null) dataSet.getMesqProject().dispose();
+				if (dataSet != null && dataSet.getMesqProject()!=null) dataSet.getMesqProject().dispose();
 			}
 			
 			for (Matrix m : dataSet.getMatrices()) {


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