X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.app.servlet.odk%2Fsrc%2Forg%2Fargeo%2Fapp%2Fservlet%2Fodk%2FOdkSubmissionServlet.java;h=9392587d917ae5058f85583f3719c906afb2eba7;hb=74c20c517b338505857d44fd0739caca48b4a8e1;hp=a5864d83336206d6e81c7229c05aea3febb3ef97;hpb=9d9479621848024ba6f09f0cafd7a0ae173f8144;p=gpl%2Fargeo-suite.git

diff --git a/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkSubmissionServlet.java b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkSubmissionServlet.java
index a5864d8..9392587 100644
--- a/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkSubmissionServlet.java
+++ b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkSubmissionServlet.java
@@ -14,7 +14,6 @@ import javax.jcr.ImportUUIDBehavior;
 import javax.jcr.Node;
 import javax.jcr.Property;
 import javax.jcr.Repository;
-import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.nodetype.NodeType;
 import javax.servlet.ServletException;
@@ -55,29 +54,31 @@ public class OdkSubmissionServlet extends HttpServlet {
 		resp.setContentType("text/xml; charset=utf-8");
 		resp.setHeader("X-OpenRosa-Version", "1.0");
 		resp.setDateHeader("Date", System.currentTimeMillis());
-		resp.setIntHeader("X-OpenRosa-Accept-Content-Length", 1024 * 1024);
+		
+		// should be set in HEAD? Let's rather use defaults.
+		//resp.setIntHeader("X-OpenRosa-Accept-Content-Length", 1024 * 1024);
 
 		RemoteAuthRequest request = new ServletHttpRequest(req);
 		Session session = RemoteAuthUtils.doAs(() -> Jcr.login(repository, null), request);
 
-		try {
-			CmsSession cmsSession = RemoteAuthUtils.getCmsSession(request);
+		CmsSession cmsSession = RemoteAuthUtils.getCmsSession(request);
 
-			Session adminSession = null;
-			try {
-				// TODO centralise at a deeper level
-				adminSession = CmsJcrUtils.openDataAdminSession(repository, null);
-				SuiteUtils.getOrCreateCmsSessionNode(adminSession, cmsSession);
-			} finally {
-				Jcr.logout(adminSession);
-			}
+		Session adminSession = null;
+		try {
+			// TODO centralise at a deeper level
+			adminSession = CmsJcrUtils.openDataAdminSession(repository, null);
+			SuiteUtils.getOrCreateCmsSessionNode(adminSession, cmsSession);
+		} finally {
+			Jcr.logout(adminSession);
+		}
 
+		try {
 			Node cmsSessionNode = SuiteUtils.getCmsSessionNode(session, cmsSession);
 			Node submission = cmsSessionNode.addNode(submissionNameFormatter.format(Instant.now()),
 					OrxType.submission.get());
 			for (Part part : req.getParts()) {
-				if (log.isDebugEnabled())
-					log.debug("Part: " + part.getName() + ", " + part.getContentType());
+				if (log.isTraceEnabled())
+					log.trace("Part: " + part.getName() + ", " + part.getContentType());
 
 				if (part.getName().equals(XML_SUBMISSION_FILE)) {
 					Node xml = submission.addNode(XML_SUBMISSION_FILE, NodeType.NT_UNSTRUCTURED);
@@ -112,12 +113,22 @@ public class OdkSubmissionServlet extends HttpServlet {
 					}
 				}
 			}
+
 			session.save();
-			for (FormSubmissionListener submissionListener : submissionListeners) {
-				submissionListener.formSubmissionReceived(submission);
+			try {
+				for (FormSubmissionListener submissionListener : submissionListeners) {
+					submissionListener.formSubmissionReceived(submission);
+				}
+			} catch (Exception e) {
+				log.error("Cannot save submision, cancelling...", e);
+				submission.remove();
+				session.save();
+				resp.setStatus(503);
+				return;
 			}
-		} catch (RepositoryException e) {
-			e.printStackTrace();
+
+		} catch (Exception e) {
+			log.error("Cannot save submision", e);
 			resp.setStatus(503);
 			return;
 		} finally {