Changeset 31964

Timestamp:

2017-09-13T16:39:11+12:00 (7 years ago)

Author:

rmw36

Message:

Some fixes to get FileUpload compiling again.

File:

• other-projects/the-macronizer/trunk/src/java/web/servlets/FileUpload.java (modified) (5 diffs)

other-projects/the-macronizer/trunk/src/java/web/servlets/FileUpload.java

@@ -29 +29 @@
 
     private File tmpdir;
+    private String inputFile;
+    private String outputFile;
 
     //Create an instance of the Logger object created for this class in log4j.properties            
@@ -84 +86 @@
             request.setAttribute("options", properties.getOptions());
             forward(address + "/main.jsp", request, response);
-        String outputText = stringFromFile(restoredFile);
-        logger.error("Output:"+outputText);
+        outputFile = stringFromFile(restoredFile);
+        logger.error("Output:"+outputFile);
         } catch (UnsupportedOperationException e) {
             FileUtil.deleteFile(restoredFile);
@@ -135 +137 @@
                     requestData.setFile(file);
                     requestData.setFilename(item.getName());
-            String logText=stringFromFile(file);
-            logger.error("Input:"+logText);
+            inputFile=stringFromFile(file);
+            // logger.error("Input:"+logText);
                 }
             }
@@ -153 +155 @@
         sb.append(line);
         }
-        return sb.toString();
     }
     catch (Exception e){
@@ -161 +162 @@
         reader.close();
     }
+        return sb.toString();
     }