| commit | 44b3ef82aefcda7b1229b906bc04b7c0c0541080 | [log] [tgz] |
|---|---|---|
| author | Tomas Kraus <tomas.kraus@oracle.com> | Thu Dec 21 12:48:11 2017 +0100 |
| committer | Tomas Kraus <tomas.kraus@oracle.com> | Thu Dec 21 12:50:33 2017 +0100 |
| tree | 3af07fb9e73f0a9a04b725ace3d4976fc7b46e94 | |
| parent | 0d06164409eeb7f3b55ee85343a58ee81e4ce998 [diff] |
Bug 522635 - Reverting IdentityMap#elements() return type to plain Enumeration. - Enumeration<Object> caused some test failures. Signed-off-by: Tomas Kraus <tomas.kraus@oracle.com>
diff --git a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/identitymaps/FullIdentityMap.java b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/identitymaps/FullIdentityMap.java index 9267a73..98521b0 100644 --- a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/identitymaps/FullIdentityMap.java +++ b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/identitymaps/FullIdentityMap.java
@@ -91,7 +91,7 @@ * @return {@link Enumeration} of {@link CacheKey#getObject()} instances. */ @Override - public Enumeration<Object> elements() { + public Enumeration elements() { return new IdentityMapEnumeration(this.getCacheKeys().values()); }
diff --git a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/identitymaps/IdentityMap.java b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/identitymaps/IdentityMap.java index e0420bd..1fb10a0 100644 --- a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/identitymaps/IdentityMap.java +++ b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/identitymaps/IdentityMap.java
@@ -100,7 +100,7 @@ /** * Allow for the cache to be iterated on. */ - public Enumeration<Object> elements(); + public Enumeration elements(); /** * Return the object cached in the identity map or null if it could not be found.
diff --git a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/identitymaps/NoIdentityMap.java b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/identitymaps/NoIdentityMap.java index e51c065..d35b5a2 100644 --- a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/identitymaps/NoIdentityMap.java +++ b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/identitymaps/NoIdentityMap.java
@@ -47,7 +47,7 @@ * Return an empty enumerator. */ @Override - public Enumeration<Object> elements() { + public Enumeration elements() { return Collections.<Object>emptyEnumeration(); }
diff --git a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/sessions/interceptors/CacheInterceptor.java b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/sessions/interceptors/CacheInterceptor.java index 8d7b458..352519a 100644 --- a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/sessions/interceptors/CacheInterceptor.java +++ b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/sessions/interceptors/CacheInterceptor.java
@@ -155,7 +155,7 @@ * Allow for the cache to be iterated on. This method is only used during debugging when * validateCache() has been called to print out the contents of the cache. */ - public Enumeration<Object> elements() { + public Enumeration elements() { return this.targetIdentityMap.elements(); }