Author: tomekr
Date: Tue Mar 13 19:31:01 2018
New Revision: 1826669
URL: http://svn.apache.org/viewvc?rev=1826669&view=rev
Log:
OAK-7335: oak-upgrade long name filter should consider the path length
Maximum length of a character in Java is 3 bytes.
Modified:
jackrabbit/oak/branches/1.6/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
jackrabbit/oak/branches/1.6/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/nodestate/NameFilteringNodeState.java
Modified:
jackrabbit/oak/branches/1.6/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java?rev=1826669&r1=1826668&r2=1826669&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
Tue Mar 13 19:31:01 2018
@@ -1019,7 +1019,7 @@ public class RepositoryUpgrade {
}
private boolean nameMayBeTooLong(String name) {
- if (name.length() <= Utils.NODE_NAME_LIMIT / 4) {
+ if (name.length() <= Utils.NODE_NAME_LIMIT / 3) {
return false;
}
if (name.getBytes(Charsets.UTF_8).length <= Utils.NODE_NAME_LIMIT) {
Modified:
jackrabbit/oak/branches/1.6/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/nodestate/NameFilteringNodeState.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/nodestate/NameFilteringNodeState.java?rev=1826669&r1=1826668&r2=1826669&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/nodestate/NameFilteringNodeState.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/nodestate/NameFilteringNodeState.java
Tue Mar 13 19:31:01 2018
@@ -77,7 +77,7 @@ public class NameFilteringNodeState exte
private boolean isNameTooLong(@Nonnull String name) {
// OAK-1589: maximum supported length of name for DocumentNodeStore
// is 150 bytes. Skip the sub tree if the the name is too long
- if (name.length() <= Utils.NODE_NAME_LIMIT / 4) {
+ if (name.length() <= Utils.NODE_NAME_LIMIT / 3) {
return false;
}
if (name.getBytes(Charsets.UTF_8).length <= Utils.NODE_NAME_LIMIT) {
