treebase-guts

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

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

Revision: 254
          http://treebase.svn.sourceforge.net/treebase/?rev=254&view=rev
Author:   youjun
Date:     2009-11-05 15:56:16 +0000 (Thu, 05 Nov 2009)

Log Message:
-----------
fix a typo

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	2009-11-05 15:41:54 UTC (rev 253)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/service/study/SubmissionServiceImpl.java	2009-11-05 15:56:16 UTC (rev 254)
@@ -929,7 +929,7 @@
 	}
 
 	
-	public Collection<Submission> findSubmissionByCreateTimeRange(Date from, Date util) {
+	public Collection<Submission> findSubmissionByCreateDateRange(Date from, Date util) {
 		
 
 		return getSubmissionHome().findByCreateDateRange(from, util);


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

[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.

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

[<hs...@us...>]

Revision: 1002
          http://treebase.svn.sourceforge.net/treebase/?rev=1002&view=rev
Author:   hshyket
Date:     2011-12-09 16:23:11 +0000 (Fri, 09 Dec 2011)
Log Message:
-----------
Fixing error with last commit.  Needed to set the study in the matrix before it saved to the database.

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	2011-12-09 15:00:21 UTC (rev 1001)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/service/study/SubmissionServiceImpl.java	2011-12-09 16:23:11 UTC (rev 1002)
@@ -692,10 +692,10 @@
 			sub.getStudy().getTaxonLabelSets().addAll(data.getTaxonLabelSets());
 
 			// Store matrice:
-			getMatrixHome().persistAll(data.getMatrices());
 			for (Matrix uploadMatrix : data.getMatrices()) {
 				uploadMatrix.setStudy(sub.getStudy());
 			}
+			getMatrixHome().persistAll(data.getMatrices());
 			sub.addMatrices(data.getMatrices());
 			getMatrixHome().flush();
 

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