Author: rombert
Date: Thu Sep 7 12:57:36 2017
New Revision: 1807599
URL: http://svn.apache.org/viewvc?rev=1807599&view=rev
Log:
OAK-2710 - Remove Utils.unshareString
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java?rev=1807599&r1=1807598&r2=1807599&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java
Thu Sep 7 12:57:36 2017
@@ -24,8 +24,6 @@ import org.apache.jackrabbit.oak.cache.C
import org.apache.jackrabbit.oak.commons.json.JsopReader;
import org.apache.jackrabbit.oak.commons.json.JsopTokenizer;
-import static
org.apache.jackrabbit.oak.plugins.document.util.Utils.unshareString;
-
/**
* A cache for child node diffs.
*/
@@ -100,7 +98,7 @@ abstract class DiffCache {
}
switch (r) {
case '+': {
- String name = unshareString(t.readString());
+ String name = t.readString();
t.read(':');
t.read('{');
while (t.read() != '}') {
@@ -110,12 +108,12 @@ abstract class DiffCache {
break;
}
case '-': {
- String name = unshareString(t.readString());
+ String name = t.readString();
continueComparison = diff.childNodeDeleted(name);
break;
}
case '^': {
- String name = unshareString(t.readString());
+ String name = t.readString();
t.read(':');
t.read('{');
t.read('}');
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1807599&r1=1807598&r2=1807599&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
Thu Sep 7 12:57:36 2017
@@ -1214,7 +1214,7 @@ public final class DocumentNodeStore
}
if (c.children.size() < limit) {
// add to children until limit is reached
- c.children.add(Utils.unshareString(PathUtils.getName(p)));
+ c.children.add(PathUtils.getName(p));
} else {
// enough collected and we know there are more
c.hasMore = true;
@@ -1390,7 +1390,7 @@ public final class DocumentNodeStore
DocumentNodeState.Children c = new
DocumentNodeState.Children();
Set<String> set = Sets.newTreeSet();
for (String p : added) {
- set.add(Utils.unshareString(PathUtils.getName(p)));
+ set.add(PathUtils.getName(p));
}
c.children.addAll(set);
PathRev key = childNodeCacheKey(path, afterLastRev, null);
@@ -1439,7 +1439,7 @@ public final class DocumentNodeStore
// list is complete. use before children as basis
Set<String> afterChildren =
Sets.newTreeSet(children.children);
for (String p : added) {
-
afterChildren.add(Utils.unshareString(PathUtils.getName(p)));
+ afterChildren.add(PathUtils.getName(p));
}
for (String p : removed) {
afterChildren.remove(PathUtils.getName(p));
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java?rev=1807599&r1=1807598&r2=1807599&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java
Thu Sep 7 12:57:36 2017
@@ -99,21 +99,6 @@ public class Utils {
}
};
- /**
- * Make sure the name string does not contain unnecessary baggage (shared
- * strings).
- * <p>
- * This is only needed for older versions of Java (before Java 7 update 6).
- * See also
- *
http://mail.openjdk.java.net/pipermail/core-libs-dev/2012-May/010257.html
- *
- * @param x the string
- * @return the new string
- */
- public static String unshareString(String x) {
- return new String(x);
- }
-
public static int pathDepth(String path) {
if (path.equals("/")) {
return 0;
