projects
/
gpl
/
argeo-suite.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify ODK submission servlet
[gpl/argeo-suite.git]
/
org.argeo.app.servlet.odk
/
src
/
org
/
argeo
/
app
/
servlet
/
odk
/
OdkSubmissionServlet.java
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 9596ebdba9f0e7b51813f3e55abc97589081455d..5efbd1b689fb4b518a65f0e0c5d429a8a9a5124a 100644
(file)
--- 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
@@
-62,8
+62,8
@@
public class OdkSubmissionServlet extends HttpServlet {
// "/" + EntityType.form.get() + "/" + EntityNames.SUBMISSIONS_BASE);
CmsSession cmsSession = RemoteAuthUtils.getCmsSession(request);
// "/" + EntityType.form.get() + "/" + EntityNames.SUBMISSIONS_BASE);
CmsSession cmsSession = RemoteAuthUtils.getCmsSession(request);
-
ClassLoader currentContextCl = Thread.currentThread().getContextClassLoader();
-
Thread.currentThread().setContextClassLoader(RemoteAuth
Utils.class.getClassLoader());
+
//
ClassLoader currentContextCl = Thread.currentThread().getContextClassLoader();
+
// Thread.currentThread().setContextClassLoader(CmsJcr
Utils.class.getClassLoader());
Session adminSession = null;
try {
// TODO centralise at a deeper level
Session adminSession = null;
try {
// TODO centralise at a deeper level
@@
-71,7
+71,7
@@
public class OdkSubmissionServlet extends HttpServlet {
SuiteUtils.getOrCreateCmsSessionNode(adminSession, cmsSession);
} finally {
Jcr.logout(adminSession);
SuiteUtils.getOrCreateCmsSessionNode(adminSession, cmsSession);
} finally {
Jcr.logout(adminSession);
-
Thread.currentThread().setContextClassLoader(currentContextCl);
+
//
Thread.currentThread().setContextClassLoader(currentContextCl);
}
Node cmsSessionNode = SuiteUtils.getCmsSessionNode(session, cmsSession);
}
Node cmsSessionNode = SuiteUtils.getCmsSessionNode(session, cmsSession);