From 8b6a544a11dee1f1b77151fb532fb1f06a7bbea6 Mon Sep 17 00:00:00 2001
From: Fabio Pistolesi <fabio.pistolesi@forgerock.com>
Date: Tue, 28 Apr 2015 13:01:03 +0000
Subject: [PATCH] OPENDJ-1972 CR-6777 Remove JDK6 compatibility layers
---
opendj-server-legacy/src/main/java/org/opends/server/backends/persistit/PersistItStorage.java | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/persistit/PersistItStorage.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/persistit/PersistItStorage.java
index 7a9b8f7..ade7349 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/persistit/PersistItStorage.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/persistit/PersistItStorage.java
@@ -1026,20 +1026,17 @@
FilePermission backendPermission = decodeDBDirPermissions(curCfg);
// Get the backend database backendDirectory permissions and apply
- if(FilePermission.canSetPermissions())
+ try
{
- try
+ if(!FilePermission.setPermissions(backendDir, backendPermission))
{
- if(!FilePermission.setPermissions(backendDir, backendPermission))
- {
- logger.warn(WARN_JEB_UNABLE_SET_PERMISSIONS, backendPermission, backendDir);
- }
+ logger.warn(WARN_JEB_UNABLE_SET_PERMISSIONS, backendPermission, backendDir);
}
- catch(Exception e)
- {
- // Log an warning that the permissions were not set.
- logger.warn(WARN_JEB_SET_PERMISSIONS_FAILED, backendDir, e);
- }
+ }
+ catch(Exception e)
+ {
+ // Log an warning that the permissions were not set.
+ logger.warn(WARN_JEB_SET_PERMISSIONS_FAILED, backendDir, e);
}
}
--
Gitblit v1.10.0