Changeset 2757

Timestamp:

03/27/13 16:30:08 (11 years ago)

Author:

twagoo

Message:

Close log file after reading tail
[Refs #294]

File:

• ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/frontend/ViewLogPage.java (modified) (4 diffs)

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/frontend/ViewLogPage.java

@@ -14 +14 @@
 import org.apache.wicket.markup.html.link.Link;
 import org.apache.wicket.model.Model;
+import org.slf4j.LoggerFactory;
 
 /**
@@ -21 +22 @@
  */
 public class ViewLogPage extends SecureAdminWebPage {
+
+    private final static org.slf4j.Logger logger = LoggerFactory.getLogger(ViewLogPage.class);
 
     public ViewLogPage(final PageParameters pageParameters) {
@@ -46 +49 @@
         if (logFile != null) {
             try {
-                final RandomAccessFile raLogFile = geFileTail(logFile, tailSize);
+                RandomAccessFile raLogFile = null;
                 try {
+                    raLogFile = geFileTail(logFile, tailSize);
                     final String content = getLogFileContent(raLogFile);
 
@@ -54 +58 @@
 
                     add(new DownloadLink("logDownloadLink", logFile));
+                } catch (IOException ioEx) {
+                    add(new Label("logLabel", "Could not read from log file. See error message below."));
+                    add(new TextArea("logText", new Model(ioEx.getMessage())));
+                    throw (ioEx);
                 } finally {
-                    raLogFile.close();
+                    if (raLogFile != null) {
+                        raLogFile.close();
+                    }
                 }
             } catch (IOException ioEx) {
-                add(new Label("logLabel", "Could not read from log file. See error message below."));
-                add(new TextArea("logText", new Model(ioEx.getMessage())));
+                logger.error("Error in reading log file", ioEx);
             }
         }