[wicket] branch master updated: Do not close the RandomAccessFile too early.

[mgrigorov]

This is an automated email from the ASF dual-hosted git repository.

mgrigorov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git


The following commit(s) were added to refs/heads/master by this push:
     new 44d0ada  Do not close the RandomAccessFile too early.
44d0ada is described below

commit 44d0ada2019a4281b6ebf7006d2b2e40713a6dea
Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org>
AuthorDate: Thu Mar 26 09:20:01 2020 +0200

    Do not close the RandomAccessFile too early.
    
    Its channel is closed by the callers
---
 .../src/main/java/org/apache/wicket/pageStore/DiskPageStore.java  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git 
a/wicket-core/src/main/java/org/apache/wicket/pageStore/DiskPageStore.java 
b/wicket-core/src/main/java/org/apache/wicket/pageStore/DiskPageStore.java
index d6bda8f..e2e78a1 100644
--- a/wicket-core/src/main/java/org/apache/wicket/pageStore/DiskPageStore.java
+++ b/wicket-core/src/main/java/org/apache/wicket/pageStore/DiskPageStore.java
@@ -18,6 +18,7 @@ package org.apache.wicket.pageStore;
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -479,14 +480,15 @@ public class DiskPageStore extends 
AbstractPersistentPageStore implements IPersi
                        if (create || file.exists())
                        {
                                String mode = create ? "rw" : "r";
-                               try (RandomAccessFile randomAccessFile = new 
RandomAccessFile(file, mode))
+                               try
                                {
+                                       RandomAccessFile randomAccessFile = new 
RandomAccessFile(file, mode);
                                        channel = randomAccessFile.getChannel();
                                }
-                               catch (IOException iox)
+                               catch (FileNotFoundException fnfx)
                                {
                                        // can happen if the file is locked. 
WICKET-4176
-                                       log.error(iox.getMessage(), iox);
+                                       log.error(fnfx.getMessage(), fnfx);
                                }
                        }
                        return channel;