mcutout: fixes type cast

data-access/servlet/src/main/java/mcutout/webapi/UWSMCutoutWork.java

@@ -68,36 +68,48 @@ public class UWSMCutoutWork extends JobThread
          long startTime_msec = System.currentTimeMillis();
          boolean showDuration = true;
 
-         UploadFile jsonFile = (UploadFile)job.getAdditionalParameterValue("mcutout");
+			logger.logThread(LogLevel.INFO, this, "Is mcutout UploadFile type?",
+															"Is mcutout UploadFile type?",null);
+         Object obj = job.getAdditionalParameterValue("mcutout");
+			if(obj instanceof UploadFile)
+			{
+			   logger.logThread(LogLevel.INFO, this, "mcutout is UploadFile",
+														"mcutout is UploadFile",null);
+				UploadFile jsonFile = (UploadFile)obj;//job.getAdditionalParameterValue("mcutout");
 
-         InputStreamReader isr = new InputStreamReader(jsonFile.open());
-         BufferedReader input = new BufferedReader(isr);
-         StringBuffer jsonStringBuffer = new StringBuffer();
-         String line;
-         while((line = input.readLine()) != null)
-         {
-            jsonStringBuffer.append(line);
-         }
-         String reqJsonString = jsonStringBuffer.toString();
+				InputStreamReader isr = new InputStreamReader(jsonFile.open());
+				BufferedReader input = new BufferedReader(isr);
+				StringBuffer jsonStringBuffer = new StringBuffer();
+				String line;
+				while((line = input.readLine()) != null)
+				{
+					jsonStringBuffer.append(line);
+				}
+				String reqJsonString = jsonStringBuffer.toString();
 
-			String workDir = settings.fitsPaths.cutouts() + "/" + job.getJobId();
-			FileUtils.forceMkdir(new File(workDir));
+				String workDir = settings.fitsPaths.cutouts() + "/" + job.getJobId();
+				FileUtils.forceMkdir(new File(workDir));
 
-         MCutResult mresult = vlkb.doMCutout(reqJsonString, workDir);
+				MCutResult mresult = vlkb.doMCutout(reqJsonString, workDir);
 
-			logger.logThread(LogLevel.INFO, this, "Prepare Result",
-					" job:requestUrl: " +  job.getUrl().getRequestURL(), null);
+				logger.logThread(LogLevel.INFO, this, "Prepare Result",
+						" job:requestUrl: " +  job.getUrl().getRequestURL(), null);
 
-			publishOnEndpoint("Report", "application/json", mresult.resJsonPathname);
-			publishOnEndpoint("mcutout.tar.gz", "application/gzip", mresult.fileName);
+				publishOnEndpoint("Report", "application/json", mresult.resJsonPathname);
+				publishOnEndpoint("mcutout.tar.gz", "application/gzip", mresult.fileName);
 
-			// delete cut-files (were published/copied to uws-file store) 
+				// delete cut-files (were published/copied to uws-file store) 
 
-			//mresult.deleteResJson();
-			//mresult.deleteCutFiles();
+				//mresult.deleteResJson();
+				//mresult.deleteCutFiles();
 
-			FileUtils.deleteDirectory(new File(workDir));
-			//FileUtils.deleteQuietly(new File(workDir));// FIXME Never throws except. leaves the dir there if error
+				FileUtils.deleteDirectory(new File(workDir));
+				//FileUtils.deleteQuietly(new File(workDir));// FIXME Never throws except. leaves the dir there if error
+			}
+			else
+			{
+              // mcutout-json not in body
+			}
 
 			/* FIXME here was uws-check is-job-Interrupted */
 		}