Commit 56d47484 authored by gmantele's avatar gmantele
Browse files

[UWS,TAP] Fix bug about UPLOAD: file upload (multipart/form-data) with a POST... 

[UWS,TAP] Fix bug about UPLOAD: file upload (multipart/form-data) with a POST to the SetJobParam action was not possible & bug in the COS library about line termintation (it should be CRLF but some clients end lines with LF and that should have been managed by the COS lib but wasn't ; correction applied by myself but feedback from the lib developer is waited).
parent 0ef180ce

buildTAP.xml

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
	<property name="classesDir" value="${compileDir}"/>

	<property name="javadocDir" value="javadoc/tap" />

	

	<property name="cosJar" value="${libDir}/cos.jar" />

	<property name="cosJar" value="${libDir}/cos-1.5beta.jar" />

	<property name="stilJar" value="${libDir}/stil3.0-5.jar" />

		

	<property name="tapPath" value="tap/**,adql/**,uws/**,cds/**" />

lib/cos-1.5beta.jar

0 → 100644
+60 KiB

File added.

No diff preview for this file type.

View file

src/uws/service/actions/SetJobParam.java

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ public class SetJobParam extends UWSAction { 
	 */

	@Override

	public boolean match(UWSUrl urlInterpreter, JobOwner user, HttpServletRequest request) throws UWSException{

		return (urlInterpreter.hasJobList() && urlInterpreter.hasJob() && ((request.getMethod().equalsIgnoreCase("post") && (!urlInterpreter.hasAttribute() || urlInterpreter.getAttributes().length == 1) && request.getParameterMap().size() > 0) || (request.getMethod().equalsIgnoreCase("put") && urlInterpreter.getAttributes().length >= 2 && urlInterpreter.getAttributes()[0].equalsIgnoreCase(UWSJob.PARAM_PARAMETERS) && request.getParameter(urlInterpreter.getAttributes()[1]) != null)));

		return (urlInterpreter.hasJobList() && urlInterpreter.hasJob() && ((request.getMethod().equalsIgnoreCase("post") && (!urlInterpreter.hasAttribute() || urlInterpreter.getAttributes().length == 1)) || (request.getMethod().equalsIgnoreCase("put") && urlInterpreter.getAttributes().length >= 2 && urlInterpreter.getAttributes()[0].equalsIgnoreCase(UWSJob.PARAM_PARAMETERS) && request.getParameter(urlInterpreter.getAttributes()[1]) != null)));

	}



	/**