X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.server%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fservices%2Fimpl%2FTestManagerServiceImpl.java;h=e8feff02007dd037297cf80a4acf6016f38ed658;hb=5fcacdb600e4c9e765cb93b46132932662832c1b;hp=acaa7b5a1636db6dae5034b6ef25c1c7f177917a;hpb=1fdb1b4e7b1d2b0cabb6483238301b857a6392fa;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/TestManagerServiceImpl.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/TestManagerServiceImpl.java
index acaa7b5a1..e8feff020 100644
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/TestManagerServiceImpl.java
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/TestManagerServiceImpl.java
@@ -43,6 +43,8 @@ public class TestManagerServiceImpl implements TestManagerService {
 	private final SlcExecutionDao slcExecutionDao;
 	private final TreeTestResultCollectionDao treeTestResultCollectionDao;
 
+	private String defaultCollectionId = "default";
+	
 	public TestManagerServiceImpl(TreeTestResultDao treeTestResultDao,
 			TestRunDescriptorDao testRunDescriptorDao,
 			SlcExecutionDao slcExecutionDao,
@@ -68,9 +70,10 @@ public class TestManagerServiceImpl implements TestManagerService {
 						.getSlcExecution(testRunDescriptor
 								.getSlcExecutionUuid());
 				if (slcExecution != null) {
-					String collectionId = slcExecution.getUser() != null ? slcExecution
-							.getUser()
-							: "default";
+					// Use Host as collection ID if host is available
+					String collectionId = slcExecution.getHost() != null ? slcExecution
+							.getHost()
+							: defaultCollectionId;
 					addResultToCollection(collectionId, testRunDescriptor
 							.getTestResultUuid());
 				}
@@ -78,7 +81,7 @@ public class TestManagerServiceImpl implements TestManagerService {
 				if (log.isTraceEnabled())
 					log.trace("ResultUUID="
 							+ testRunDescriptor.getTestResultUuid());
-				addResultToCollection("default", testRunDescriptor
+				addResultToCollection(defaultCollectionId, testRunDescriptor
 						.getTestResultUuid());
 			}
 		}
@@ -156,4 +159,8 @@ public class TestManagerServiceImpl implements TestManagerService {
 
 	}
 
+	public void setDefaultCollectionId(String defaultCollectionId) {
+		this.defaultCollectionId = defaultCollectionId;
+	}
+
 }