You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2019/11/22 08:07:29 UTC
svn commit: r1870140 - in /jackrabbit/oak/branches/1.10: ./
oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Author: reschke
Date: Fri Nov 22 08:07:29 2019
New Revision: 1870140
URL: http://svn.apache.org/viewvc?rev=1870140&view=rev
Log:
OAK-8764: RDBDocumentStore: avoid potential dangerous use of addAll(entrySet) in logging code (merged r1869748 into 1.10)
Modified:
jackrabbit/oak/branches/1.10/ (props changed)
jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Propchange: jackrabbit/oak/branches/1.10/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1869748
Modified: jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1870140&r1=1870139&r2=1870140&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java (original)
+++ jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java Fri Nov 22 08:07:29 2019
@@ -41,7 +41,6 @@ import java.sql.Types;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
-import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -2354,13 +2353,8 @@ public class RDBDocumentStore implements
if (cnUpdates.isEmpty()) {
return "";
} else {
- List<Map.Entry<String, Long>> tmp = new ArrayList<Map.Entry<String, Long>>();
- tmp.addAll(cnUpdates.entrySet());
- Collections.sort(tmp, new Comparator<Map.Entry<String, Long>>() {
- @Override
- public int compare(Entry<String, Long> o1, Entry<String, Long> o2) {
- return o1.getKey().compareTo(o2.getKey());
- }});
+ List<Map.Entry<String, Long>> tmp = new ArrayList<>(cnUpdates.entrySet());
+ Collections.sort(tmp, (Entry<String, Long> o1, Entry<String, Long> o2) -> o1.getKey().compareTo(o2.getKey()));
return " (Cluster Node updates: " + tmp.toString() + ")";
}
}