X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=org.argeo.app.servlet.odk%2Fsrc%2Forg%2Fargeo%2Fapp%2Fservlet%2Fodk%2FOdkManifestServlet.java;h=f296170778a381e05cfbf61a52751ee8bb12839a;hp=9d1812cabfb6b8f13cdf316206b8c29ec45542bd;hb=6c42d7ee01c29a184390a3fd789ebdf5cde84a00;hpb=f3512714c0498467d8376ae1050bc3b727d0a84f

diff --git a/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkManifestServlet.java b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkManifestServlet.java
index 9d1812c..f296170 100644
--- a/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkManifestServlet.java
+++ b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkManifestServlet.java
@@ -91,21 +91,13 @@ public class OdkManifestServlet extends HttpServlet {
 
 							MessageDigest messageDigest = MessageDigest.getInstance(DigestUtils.MD5);
 							// TODO cache a temp file ?
-							try (DigestOutputStream out = new DigestOutputStream(new NullOutputStream(),
+							try (DigestOutputStream out = new DigestOutputStream(NullOutputStream.NULL_OUTPUT_STREAM,
 									messageDigest)) {
 								writeMediaFile(out, target, mimeType, charset);
 								writer.append("<hash>");
 								writer.append("md5sum:" + DigestUtils.toHexString(out.getMessageDigest().digest()));
 								writer.append("</hash>");
 							}
-
-//							try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
-//								session.exportDocumentView(target.getPath(), out, true, false);
-//								String fileCsum = DigestUtils.digest(DigestUtils.MD5, out.toByteArray());
-//								writer.append("<hash>");
-//								writer.append("md5sum:" + fileCsum);
-//								writer.append("</hash>");
-//							}
 							writer.append("<downloadUrl>" + protocol + "://" + serverName
 									+ (serverPort == 80 || serverPort == 443 ? "" : ":" + serverPort)
 									+ "/api/odk/formManifest" + file.getPath() + "</downloadUrl>");
@@ -123,11 +115,6 @@ public class OdkManifestServlet extends HttpServlet {
 					Node target = node.getProperty(Property.JCR_ID).getNode();
 
 					writeMediaFile(resp.getOutputStream(), target, mimeType, charset);
-//					try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
-//						session.exportDocumentView(target.getPath(), out, true, false);
-//						System.out.println(new String(out.toByteArray(), StandardCharsets.UTF_8));
-//						resp.getOutputStream().write(out.toByteArray());
-//					}
 				} else {
 					throw new IllegalArgumentException("Unsupported node " + node);
 				}