[wicket] branch master updated: WICKET-6802 guard agains any exception

[sv...@apache.org]

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

svenmeier 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 ba99857  WICKET-6802 guard agains any exception
ba99857 is described below

commit ba998571d3b4e27bda8ddcdaa60ab85fc33b4646
Author: Sven Meier <sv...@apache.org>
AuthorDate: Fri Jul 17 15:13:21 2020 +0200

    WICKET-6802 guard agains any exception
    
    storing the page type is optional anyway
---
 .../org/apache/wicket/pageStore/FilePageStore.java     | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/wicket-core/src/main/java/org/apache/wicket/pageStore/FilePageStore.java b/wicket-core/src/main/java/org/apache/wicket/pageStore/FilePageStore.java
index 9e21715..4462b1b 100644
--- a/wicket-core/src/main/java/org/apache/wicket/pageStore/FilePageStore.java
+++ b/wicket-core/src/main/java/org/apache/wicket/pageStore/FilePageStore.java
@@ -296,14 +296,14 @@ public class FilePageStore extends AbstractPersistentPageStore implements IPersi
 		String pageType = null;
 		try
 		{
-			UserDefinedFileAttributeView view = java.nio.file.Files
-				.getFileAttributeView(file.toPath(), UserDefinedFileAttributeView.class);
+			UserDefinedFileAttributeView view = getAttributeView(file);
+			
 			ByteBuffer buffer = ByteBuffer.allocate(view.size(ATTRIBUTE_PAGE_TYPE));
 			view.read(ATTRIBUTE_PAGE_TYPE, buffer);
 			buffer.flip();
 			pageType = Charset.defaultCharset().decode(buffer).toString();
 		}
-		catch (IOException ex)
+		catch (Exception ex)
 		{
 			log.debug("cannot get pageType for {}", file);
 		}
@@ -311,6 +311,12 @@ public class FilePageStore extends AbstractPersistentPageStore implements IPersi
 		return pageType;
 	}
 
+	private UserDefinedFileAttributeView getAttributeView(File file)
+	{
+		return java.nio.file.Files
+			.getFileAttributeView(file.toPath(), UserDefinedFileAttributeView.class);
+	}
+
 	/**
 	 * Set the type of page on the given file.
 	 * <p>
@@ -323,11 +329,11 @@ public class FilePageStore extends AbstractPersistentPageStore implements IPersi
 	{
 		try
 		{
-			UserDefinedFileAttributeView view = java.nio.file.Files
-				.getFileAttributeView(file.toPath(), UserDefinedFileAttributeView.class);
+			UserDefinedFileAttributeView view = getAttributeView(file);
+			
 			view.write(ATTRIBUTE_PAGE_TYPE, Charset.defaultCharset().encode(pageType));
 		}
-		catch (IOException ex)
+		catch (Exception ex)
 		{
 			log.debug("cannot set pageType for {}", file, ex);
 		}