Imported from /home/lorry/working-area/delta_berkeleydb/db-6.1.23.tar.gz.HEADdb-6.1.23master

1 files changed, 3 insertions, 3 deletions

diff --git a/lang/java/src/com/sleepycat/persist/impl/Evolver.java b/lang/java/src/com/sleepycat/persist/impl/Evolver.java
index b1d180b7..f4cd155c 100644
--- a/lang/java/src/com/sleepycat/persist/impl/Evolver.java
+++ b/lang/java/src/com/sleepycat/persist/impl/Evolver.java
@@ -1,7 +1,7 @@
 /*-
  * See the file LICENSE for redistribution information.
  *
- * Copyright (c) 2002, 2012 Oracle and/or its affiliates.  All rights reserved.
+ * Copyright (c) 2002, 2015 Oracle and/or its affiliates.  All rights reserved.
  *
  */
 
@@ -355,8 +355,8 @@ class Evolver {
                     return false;
                 }
                 if (oldLatestFormat == oldLatestFormat.getLatestVersion()) {
-                    assert !newFormats.containsValue(newFormat) : newFormat;
-                    /* newFormat equals oldLatestFormat and was discarded. */
+                    /* newFormat is no longer relevant [#21869]. */
+                    newFormats.remove(newFormat.getClassName());
                     newFormat = oldLatestFormat;
                 }
             }