diff --git a/java/rocksjni/backupablejni.cc b/java/rocksjni/backupablejni.cc
index 83c641370c6a4ab4ade2fd2f4206ca12ebc41361..8007e2ce0698d841c0f072fafc88abe3d4431fc2 100644
--- a/java/rocksjni/backupablejni.cc
+++ b/java/rocksjni/backupablejni.cc
@@ -103,10 +103,11 @@ jintArray Java_org_rocksdb_BackupableDB_getCorruptedBackups(
   reinterpret_cast<rocksdb::BackupableDB*>(jhandle)->
       GetCorruptedBackups(&backup_ids);
   // store backupids in int array
-  const int kIdSize = backup_ids.size();
+  const std::vector<rocksdb::BackupID>::size_type
+      kIdSize = backup_ids.size();
   int int_backup_ids[kIdSize];
   for (std::vector<rocksdb::BackupID>::size_type i = 0;
-      i != backup_ids.size(); i++) {
+      i != kIdSize; i++) {
     int_backup_ids[i] = backup_ids[i];
   }
   // Store ints in java array
diff --git a/java/rocksjni/restorejni.cc b/java/rocksjni/restorejni.cc
index ad8749758c2003e0d85aa730773dd8eac84f454c..4fe747e100900c011892a5d51d5eeefdace4d850 100644
--- a/java/rocksjni/restorejni.cc
+++ b/java/rocksjni/restorejni.cc
@@ -156,10 +156,12 @@ jintArray Java_org_rocksdb_RestoreBackupableDB_getCorruptedBackups(
   reinterpret_cast<rocksdb::RestoreBackupableDB*>(jhandle)->
       GetCorruptedBackups(&backup_ids);
   // store backupids in int array
-  const int kIdSize = backup_ids.size();
+  const std::vector<rocksdb::BackupID>::size_type
+        kIdSize = backup_ids.size();
+
   int int_backup_ids[kIdSize];
   for (std::vector<rocksdb::BackupID>::size_type i = 0;
-      i != backup_ids.size(); i++) {
+      i != kIdSize; i++) {
     int_backup_ids[i] = backup_ids[i];
   }
   // Store ints in java array