X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fjcr%2Fdao%2FTestRunDescriptorDaoJcr.java;h=8cafb1777a3ea39384ecfe9987b9b639d76132e4;hb=699640c58cc0578beebfc3edd00dac9eed65ee0b;hp=44db33deffad86a366ac821b64f76242f8bba05a;hpb=b554c0910f6ddce935ceea5f99d399fe23af6f58;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/dao/TestRunDescriptorDaoJcr.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/dao/TestRunDescriptorDaoJcr.java
index 44db33def..8cafb1777 100644
--- a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/dao/TestRunDescriptorDaoJcr.java
+++ b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/dao/TestRunDescriptorDaoJcr.java
@@ -1,6 +1,22 @@
+/*
+ * Copyright (C) 2007-2012 Mathieu Baudier
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.argeo.slc.jcr.dao;
 
 import javax.jcr.Node;
+import javax.jcr.RepositoryException;
 import javax.jcr.query.Query;
 
 import org.argeo.jcr.JcrUtils;
@@ -12,17 +28,13 @@ public class TestRunDescriptorDaoJcr extends AbstractSlcJcrDao implements
 		TestRunDescriptorDao {
 
 	public TestRunDescriptor getTestRunDescriptor(String id) {
-		try {
-			// TODO: optimize query
-			String queryString = "//testrun[@testRunUuid='" + id + "']";
-			Query query = queryManager.createQuery(queryString, Query.XPATH);
-			Node node = JcrUtils.querySingleNode(query);
-			if (node == null)
-				return null;
-			return (TestRunDescriptor) nodeMapper.load(node);
-		} catch (Exception e) {
-			throw new SlcException("Cannot load test run descriptor" + id, e);
-		}
+		// TODO: optimize query
+		String queryString = "//testrun[@testRunUuid='" + id + "']";
+		Query query = createQuery(queryString, Query.XPATH);
+		Node node = JcrUtils.querySingleNode(query);
+		if (node == null)
+			return null;
+		return (TestRunDescriptor) nodeMapper.load(node);
 	}
 
 	public void saveOrUpdate(TestRunDescriptor testRunDescriptor) {
@@ -30,7 +42,7 @@ public class TestRunDescriptorDaoJcr extends AbstractSlcJcrDao implements
 			nodeMapper.save(getSession(), basePath(testRunDescriptor),
 					testRunDescriptor);
 			getSession().save();
-		} catch (Exception e) {
+		} catch (RepositoryException e) {
 			throw new SlcException("Cannot import " + testRunDescriptor, e);
 		}
 	}