Fix: Don't resave the transaction itself (#1671)

Author: Gal Rogozinski

src/main/java/com/iota/iri/Iota.java

@@ -223,7 +223,8 @@ private void rescanDb() throws Exception {
                 log.info("Rescanned {} Transactions", counter);
             }
             List<Pair<Indexable, Persistable>> saveBatch = tx.getSaveBatch();
-            saveBatch.remove(5);
+            //don't re-save the tx itself
+            saveBatch.remove(saveBatch.size() - 1);
             tangle.saveBatch(saveBatch);
             tx = tx.next(tangle);
         }

src/main/java/com/iota/iri/controllers/TransactionViewModel.java

@@ -350,13 +350,15 @@ public List<Pair<Indexable, Persistable>> getMetadataSaveBatch() {
      * The method then ensures that the {@link Transaction#bytes} are present before adding the {@link Transaction} and
      * {@link Hash} identifier to the already compiled list of {@link Transaction} components.
      *
-     * @return A complete list of all {@link Transaction} component objects paired with their {@link Hash} identifiers
+     * @return A complete list of all {@link Transaction} component objects paired with their {@link Hash} identifiers.
+     * The transaction object itself must be the last item in the list.
      * @throws Exception Thrown if the metadata fails to fetch, or if the bytes are not retrieved correctly
      */
     public List<Pair<Indexable, Persistable>> getSaveBatch() throws Exception {
         List<Pair<Indexable, Persistable>> hashesList = new ArrayList<>();
         hashesList.addAll(getMetadataSaveBatch());
         getBytes();
+        //must be last
         hashesList.add(new Pair<>(hash, transaction));
         return hashesList;
     }