You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by am...@apache.org on 2016/12/14 04:10:59 UTC
svn commit: r1774123 -
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/DataStoreCacheUpgradeUtils.java
Author: amitj
Date: Wed Dec 14 04:10:58 2016
New Revision: 1774123
URL: http://svn.apache.org/viewvc?rev=1774123&view=rev
Log:
OAK-5297: Check for null homeDir in DataStoreCacheUpgradeUtils
Ignored if null homeDIr passed as parameter
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/DataStoreCacheUpgradeUtils.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/DataStoreCacheUpgradeUtils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/DataStoreCacheUpgradeUtils.java?rev=1774123&r1=1774122&r2=1774123&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/DataStoreCacheUpgradeUtils.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/DataStoreCacheUpgradeUtils.java Wed Dec 14 04:10:58 2016
@@ -146,36 +146,38 @@ public class DataStoreCacheUpgradeUtils
*/
public static void movePendingUploadsToStaging(File homeDir, File path, boolean deleteMap) {
File newUploadDir = new File(path, UPLOAD_STAGING_DIR);
-
- Map<String, Long> pendingUploads = deSerializeUploadMap(homeDir);
- Iterator<String> pendingFileIter = pendingUploads.keySet().iterator();
-
- while(pendingFileIter.hasNext()) {
- String file = pendingFileIter.next();
- File upload = new File(path, file);
- LOG.trace("Pending upload absolute path " + upload.getAbsolutePath());
-
- File newUpload = new File(newUploadDir, file);
- LOG.trace("Pending upload upgrade absolute path " + newUpload.getAbsolutePath());
-
- newUpload.getParentFile().mkdirs();
-
- if (upload.exists()) {
- LOG.trace(upload + " File exists");
- try {
- FileUtils.moveFile(upload, newUpload);
- LOG.info("Pending upload file [{}] moved to [{}]", upload, newUpload);
- recursiveDelete(upload, path);
- } catch (Exception e) {
- LOG.warn("Unable to move pending upload file [{}] to [{}]", upload, newUpload);
+ if (homeDir != null && homeDir.exists()) {
+ Map<String, Long> pendingUploads = deSerializeUploadMap(homeDir);
+ Iterator<String> pendingFileIter = pendingUploads.keySet().iterator();
+
+ while (pendingFileIter.hasNext()) {
+ String file = pendingFileIter.next();
+ File upload = new File(path, file);
+ LOG.trace("Pending upload absolute path " + upload.getAbsolutePath());
+
+ File newUpload = new File(newUploadDir, file);
+ LOG.trace("Pending upload upgrade absolute path " + newUpload.getAbsolutePath());
+
+ newUpload.getParentFile().mkdirs();
+
+ if (upload.exists()) {
+ LOG.trace(upload + " File exists");
+ try {
+ FileUtils.moveFile(upload, newUpload);
+ LOG.info("Pending upload file [{}] moved to [{}]", upload, newUpload);
+ recursiveDelete(upload, path);
+ } catch (Exception e) {
+ LOG.warn("Unable to move pending upload file [{}] to [{}]", upload,
+ newUpload);
+ }
+ } else {
+ LOG.warn("File [{}] does not exist", upload);
}
- } else {
- LOG.warn("File [{}] does not exist", upload);
}
- }
- if (deleteMap) {
- deleteSerializedUploadMap(homeDir);
+ if (deleteMap) {
+ deleteSerializedUploadMap(homeDir);
+ }
}
}