From 196885498bea1e8c9a365c333b9460c2094b2304 Mon Sep 17 00:00:00 2001 From: Gunnar Morling Date: Fri, 3 May 2013 12:59:06 +0200 Subject: [PATCH] HHH-8219 - Removing references to methods added in Java 7 --- .../org/hibernate/internal/util/collections/JoinedIterator.java | 2 +- .../src/main/java/org/hibernate/mapping/Collection.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/JoinedIterator.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/JoinedIterator.java index 28a910d9b7..02831f4dab 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/JoinedIterator.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/JoinedIterator.java @@ -76,7 +76,7 @@ public class JoinedIterator implements Iterator { protected void updateCurrentIterator() { if ( currentIterator == null ) { if( wrappedIterators.length == 0 ) { - currentIterator = Collections.emptyIterator(); + currentIterator = Collections.emptyList().iterator(); } else { currentIterator = wrappedIterators[0]; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java b/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java index ba1ec4e63d..22cea240b7 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java @@ -367,7 +367,7 @@ public abstract class Collection implements Fetchable, Value, Filterable { } public Iterator getColumnIterator() { - return Collections.emptyIterator(); + return Collections.emptyList().iterator(); } public int getColumnSpan() {