Skip to content

Commit be25d11

Browse files
arvindkandharesijie
authored andcommitted
Upgrading Guava to 20.0 (apache#7)
1 parent 1b03f06 commit be25d11

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -813,9 +813,10 @@ public void run() {
813813
ZeroBuffer.put(paddingBuff);
814814
JournalChannel logFile = null;
815815
forceWriteThread.start();
816-
Stopwatch journalAllocationWatcher = new Stopwatch();
817-
Stopwatch journalCreationWatcher = new Stopwatch();
818-
Stopwatch journalFlushWatcher = new Stopwatch();
816+
Stopwatch journalAllocationWatcher = Stopwatch.createUnstarted();
817+
Stopwatch journalCreationWatcher = Stopwatch.createUnstarted();
818+
Stopwatch journalFlushWatcher = Stopwatch.createUnstarted();
819+
819820
long batchSize = 0;
820821
try {
821822
List<Long> journalIds = listJournalIds(journalDirectory, null);

bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/ReplicationWorker.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ private void rereplicate() throws InterruptedException, BKException,
205205
long ledgerIdToReplicate = underreplicationManager
206206
.getLedgerToRereplicate();
207207

208-
Stopwatch stopwatch = new Stopwatch().start();
208+
Stopwatch stopwatch = Stopwatch.createStarted();
209209
boolean success = false;
210210
try {
211211
success = rereplicate(ledgerIdToReplicate);

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<!-- ProtocolBuffer version -->
6262
<protobuf.version>2.4.1</protobuf.version>
6363
<!-- Guava Version -->
64-
<guava.version>16.0</guava.version>
64+
<guava.version>20.0</guava.version>
6565
<netty.version>3.9.4.Final</netty.version>
6666
<zookeeper.version>3.5.1-alpha</zookeeper.version>
6767
</properties>

0 commit comments

Comments
 (0)