Author: reschke
Date: Tue Jan 23 09:49:37 2018
New Revision: 1821979
URL: http://svn.apache.org/viewvc?rev=1821979&view=rev
Log:
OAK-7186: avoid use of guava Iterators.emptyIterator()
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionHistoryDelegate.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionHistoryDelegate.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionHistoryDelegate.java?rev=1821979&r1=1821978&r2=1821979&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionHistoryDelegate.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionHistoryDelegate.java
Tue Jan 23 09:49:37 2018
@@ -177,7 +177,7 @@ public class VersionHistoryDelegate exte
NodeDelegate versionable = sessionDelegate.getNodeByIdentifier(id);
if (versionable == null
|| versionable.getPropertyOrNull(JCR_BASEVERSION) == null) {
- return Iterators.emptyIterator();
+ return Collections.emptyIterator();
}
Deque<VersionDelegate> linearVersions = new
ArrayDeque<VersionDelegate>();
VersionManagerDelegate vMgr =
VersionManagerDelegate.create(sessionDelegate);
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java?rev=1821979&r1=1821978&r2=1821979&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
Tue Jan 23 09:49:37 2018
@@ -32,6 +32,7 @@ import static org.apache.jackrabbit.oak.
import java.io.InputStream;
import java.math.BigDecimal;
import java.util.Calendar;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -1286,7 +1287,7 @@ public class NodeImpl<T extends NodeDele
@Nonnull
private Iterator<String> getMixinTypeNames(@Nonnull Tree tree) throws
RepositoryException {
- Iterator<String> mixinNames = Iterators.emptyIterator();
+ Iterator<String> mixinNames = Collections.emptyIterator();
if (tree.hasProperty(JcrConstants.JCR_MIXINTYPES) ||
canReadProperty(tree, JcrConstants.JCR_MIXINTYPES)) {
mixinNames = TreeUtil.getNames(tree,
JcrConstants.JCR_MIXINTYPES).iterator();
} else if (tree.getStatus() != Status.NEW) {
