Merge remote-tracking branch 'origin/fix' into fix

# Conflicts:
#	src/main/java/org/tron/core/db/TronDatabase.java

Author: CodeNinjaEvan

src/main/java/org/tron/core/db/TronDatabase.java

@@ -3,7 +3,6 @@
 import com.google.protobuf.InvalidProtocolBufferException;
 import java.util.Iterator;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.tron.common.storage.leveldb.LevelDbDataSourceImpl;
 import org.tron.common.utils.Quitable;
 import org.tron.core.config.args.Args;
@@ -16,7 +15,7 @@ public abstract class TronDatabase<T> implements Iterable<T>, Quitable {
 
   protected LevelDbDataSourceImpl dbSource;
 
-   protected IndexHelper indexHelper;
+  protected IndexHelper indexHelper;
 
   protected TronDatabase(String dbName) {
     dbSource = new LevelDbDataSourceImpl(Args.getInstance().getOutputDirectory(), dbName);
@@ -31,12 +30,16 @@ public LevelDbDataSourceImpl getDbSource() {
     return dbSource;
   }
 
-  /** reset the database. */
+  /**
+   * reset the database.
+   */
   public void reset() {
     dbSource.resetDb();
   }
 
-  /** close the database. */
+  /**
+   * close the database.
+   */
   @Override
   public void close() {
     dbSource.closeDB();