Fix NPE

evrignaud · Oct 16, 2015 · f8bec5d · f8bec5d
1 parent 0683bcd
commit f8bec5d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/main/java/org/fim/command/ResetFileAttributesCommand.java b/src/main/java/org/fim/command/ResetFileAttributesCommand.java
@@ -137,7 +137,7 @@ private boolean resetDosPermissions(Path file, FileState fileState, DosFileAttri
 	{
 		String permissions = DosFilePermissions.toString(dosFileAttributes);
 		String previousPermissions = getAttribute(fileState, FileAttribute.DosFilePermissions);
-		if (!Objects.equals(permissions, previousPermissions))
+		if (previousPermissions != null && !Objects.equals(permissions, previousPermissions))
 		{
 			DosFilePermissions.setPermissions(file, previousPermissions);
 			System.out.printf("Set permissions: %s \t%s -> %s%n", fileState.getFileName(), permissions, previousPermissions);
@@ -150,7 +150,7 @@ private boolean resetPosixPermissions(Path file, FileState fileState, PosixFileA
 	{
 		String permissions = PosixFilePermissions.toString(posixFileAttributes.permissions());
 		String previousPermissions = getAttribute(fileState, FileAttribute.PosixFilePermissions);
-		if (!Objects.equals(permissions, previousPermissions))
+		if (previousPermissions != null && !Objects.equals(permissions, previousPermissions))
 		{
 			Set<PosixFilePermission> permissionSet = PosixFilePermissions.fromString(previousPermissions);
 			Files.getFileAttributeView(file, PosixFileAttributeView.class).setPermissions(permissionSet);
@@ -192,7 +192,7 @@ private boolean resetSELinux(Path file, FileState fileState)
 		{
 			String label = SELinux.getLabel(file);
 			String previousLabel = getAttribute(fileState, FileAttribute.SELinuxLabel);
-			if (!Objects.equals(label, previousLabel))
+			if (previousLabel != null && !Objects.equals(label, previousLabel))
 			{
 				SELinux.setLabel(file, previousLabel);
 				System.out.printf("Set SELinux: %s \t%s -> %s%n", fileState.getFileName(), label, previousLabel);