Merge pull request #878 from iiimoon/develop

 typo fixes/spelling corrections , IO handler leak fix

Author: zhaohong

src/main/java/org/tron/common/application/ApplicationImpl.java

@@ -117,7 +117,7 @@ private void closeConnection() {
     try {
       p2pNode.close();
     } catch (Exception e) {
-      System.err.println("faild to close p2pNode. " + e);
+      System.err.println("failed to close p2pNode. " + e);
     } finally {
       System.err.println("******** end to shutdown connection ********");
     }

src/main/java/org/tron/common/overlay/server/SyncPool.java

@@ -51,7 +51,7 @@ public class SyncPool {
   public static final Logger logger = LoggerFactory.getLogger("SyncPool");
 
   private static final long WORKER_TIMEOUT = 16;
-  private static final double fator = 0.4;
+  private static final double factor = 0.4;
 
   private final List<PeerConnection> activePeers = Collections.synchronizedList(new ArrayList<PeerConnection>());
   private final AtomicInteger passivePeersCount = new AtomicInteger(0);
@@ -106,7 +106,7 @@ public void init(PeerConnectionDelegate peerDel) {
   }
 
   private void fillUp() {
-    int lackSize = (int) (maxActiveNodes * fator) - activePeers.size();
+    int lackSize = (int) (maxActiveNodes * factor) - activePeers.size();
     if(lackSize <= 0) return;
 
     final Set<String> nodesInUse = channelManager.nodesInUse();

src/main/java/org/tron/core/capsule/AccountCapsule.java

@@ -77,7 +77,7 @@ public AccountCapsule(final AccountCreateContract contract) {
   }
 
   /**
-   * construct account from AccountCreateContract and creatTime.
+   * construct account from AccountCreateContract and createTime.
    */
   public AccountCapsule(final AccountCreateContract contract, long createTime) {
     this.account = Account.newBuilder()

src/main/java/org/tron/core/capsule/TransactionCapsule.java

@@ -191,7 +191,7 @@ private Sha256Hash getRawHash() {
   }
 
   /**
-   * cheack balance of the address.
+   * check balance of the address.
    */
   public boolean checkBalance(byte[] address, byte[] to, long amount, long balance) {
     if (!Wallet.addressValid(address)) {

src/main/java/org/tron/core/config/args/Args.java

@@ -519,8 +519,10 @@ private static void externalIp(final com.typesafe.config.Config config) {
         .getString("node.discovery.external.ip").trim().isEmpty()) {
       if (INSTANCE.nodeExternalIp == null) {
         logger.info("External IP wasn't set, using checkip.amazonaws.com to identify it...");
-        try (BufferedReader in = new BufferedReader(new InputStreamReader(
-            new URL("http://checkip.amazonaws.com").openStream()))) {
+        BufferedReader in = null;
+        try {
+          in = new BufferedReader(new InputStreamReader(
+              new URL("http://checkip.amazonaws.com").openStream()));
           INSTANCE.nodeExternalIp = in.readLine();
           if (INSTANCE.nodeExternalIp == null || INSTANCE.nodeExternalIp.trim().isEmpty()) {
             throw new IOException("Invalid address: '" + INSTANCE.nodeExternalIp + "'");
@@ -536,6 +538,15 @@ private static void externalIp(final com.typesafe.config.Config config) {
           logger.warn(
               "Can't get external IP. Fall back to peer.bind.ip: " + INSTANCE.nodeExternalIp + " :"
                   + e);
+        }finally{
+          if (in != null){
+            try {
+              in.close();
+            } catch (IOException e) {
+              //ignore
+            }
+          }
+
         }
       }
     } else {

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

@@ -62,7 +62,7 @@ public synchronized void onCreate(RevokingTuple tuple, byte[] value) {
       return;
     }
 
-    addIfEmtpy();
+    addIfEmpty();
     RevokingState state = stack.peekLast();
     state.newIds.add(tuple);
   }
@@ -73,7 +73,7 @@ public synchronized void onModify(RevokingTuple tuple, byte[] value) {
       return;
     }
 
-    addIfEmtpy();
+    addIfEmpty();
     RevokingState state = stack.peekLast();
     if (state.newIds.contains(tuple) || state.oldValues.containsKey(tuple)) {
       return;
@@ -88,7 +88,7 @@ public synchronized void onRemove(RevokingTuple tuple, byte[] value) {
       return;
     }
 
-    addIfEmtpy();
+    addIfEmpty();
     RevokingState state = stack.peekLast();
     if (state.newIds.contains(tuple)) {
       state.newIds.remove(tuple);
@@ -239,7 +239,7 @@ public synchronized void disable() {
     disabled = true;
   }
 
-  private void addIfEmtpy() {
+  private void addIfEmpty() {
     if (stack.isEmpty()) {
       stack.add(new RevokingState());
     }
@@ -280,7 +280,7 @@ public synchronized void shutdown() {
         }
       }
     } catch (Exception e) {
-      System.err.println("******** faild to pop revokingStore. " + e);
+      System.err.println("******** failed to pop revokingStore. " + e);
     } finally {
       System.err.println("******** after revokingStore size:" + stack.size());
       System.err.println("******** after revokingStore contains:" + stack);
@@ -306,9 +306,9 @@ public Dialog(RevokingDatabase revokingDatabase) {
       this(revokingDatabase, false);
     }
 
-    public Dialog(RevokingDatabase revokingDatabase, boolean disbaleOnExit) {
+    public Dialog(RevokingDatabase revokingDatabase, boolean disableOnExit) {
       this.revokingDatabase = revokingDatabase;
-      this.disableOnExit = disbaleOnExit;
+      this.disableOnExit = disableOnExit;
     }
 
     void commit() throws RevokingStoreIllegalStateException {

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

@@ -30,7 +30,7 @@ public class ByteArrayWrapper implements Comparable<ByteArrayWrapper>, Serializa
   private int hashCode = 0;
 
   /**
-   * construcor.
+   * constructor.
    */
   public ByteArrayWrapper(byte[] data) {
     if (data == null) {

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

@@ -633,7 +633,7 @@ public synchronized void pushBlock(final BlockCapsule block)
 
       if (!block.generatedByMyself) {
         if (!block.validateSignature()) {
-          logger.info("The siganature is not validated.");
+          logger.info("The signature is not validated.");
           // TODO: throw exception here.
           return;
         }
@@ -1234,7 +1234,7 @@ private void closeOneStore(TronDatabase database) {
     try {
       database.close();
     } catch (Exception e) {
-      System.err.println("faild to close  " + database.getName() + ". " + e);
+      System.err.println("failed to close  " + database.getName() + ". " + e);
     } finally {
       System.err.println("******** end to close " + database.getName() + " ********");
     }

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

@@ -50,7 +50,6 @@ public long getTotalTransactions() {
     return dbSource.getTotal();
   }
 
-
   @Override
   public Iterator<Entry<byte[], TransactionCapsule>> iterator() {
     return new TransactionIterator(dbSource.iterator());

src/main/java/org/tron/core/net/node/NodeDelegateImpl.java

@@ -57,7 +57,7 @@ public synchronized LinkedList<Sha256Hash> handleBlock(BlockCapsule block, boole
       throw new BadBlockException("block size over limit");
     }
 
-    // TODO timestamp shouble be consistent.
+    // TODO timestamp should be consistent.
     long gap = block.getTimeStamp() - System.currentTimeMillis();
     if (gap >= BLOCK_PRODUCED_INTERVAL) {
       throw new BadBlockException("block time error");
@@ -84,11 +84,11 @@ public synchronized LinkedList<Sha256Hash> handleBlock(BlockCapsule block, boole
     } catch (ContractValidateException e) {
       throw new BadBlockException("ContractValidate exception," + e.getMessage());
     } catch (ContractExeException e) {
-      throw new BadBlockException("Contract Exectute exception," + e.getMessage());
+      throw new BadBlockException("Contract Execute exception," + e.getMessage());
     } catch (TaposException e) {
       throw new BadBlockException("tapos exception," + e.getMessage());
     } catch (DupTransactionException e) {
-      throw new BadBlockException("DupTransation exception," + e.getMessage());
+      throw new BadBlockException("DupTransaction exception," + e.getMessage());
     } catch (TooBigTransactionException e) {
       throw new BadBlockException("TooBigTransaction exception," + e.getMessage());
     } catch (TransactionExpirationException e) {