Fix merge conflicts

ethereum · Jun 28, 2016 · e854dd5 · e854dd5
1 parent e63dd90
commit e854dd5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/ethereumj-core/src/main/java/org/ethereum/config/blockchain/HomesteadDAOConfig.java b/ethereumj-core/src/main/java/org/ethereum/config/blockchain/HomesteadDAOConfig.java
@@ -94,7 +94,7 @@ public String validateTransactionChanges(BlockStore blockStore, Block curBlock,
                     BigInteger oldBalance = repositoryTrack.getOriginRepository().getBalance(address.getData());
                     if (newBalance.compareTo(oldBalance) < 0) {
                         for (byte[] whiteRecipient : whitelist) {
-                            if (FastByteComparisons.equal(tx.getReceiveAddress(), whiteRecipient)) {
+                            if (FastByteComparisons.compareTo(tx.getReceiveAddress(), 0, 20, whiteRecipient, 0, 20) == 0) {
                                 return null;
                             }
                         }