diff --git a/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java b/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
index cc0cb8f4e10..33915937ad7 100644
--- a/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
+++ b/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
@@ -433,11 +433,10 @@ public class WeightedSpanTermExtractor {
   static private class PositionCheckingMap extends HashMap {
 
     public void putAll(Map m) {
-      Iterator it = m.keySet().iterator();
+      Iterator it = m.entrySet().iterator();
       while (it.hasNext()) {
-        Object key = it.next();
-        Object val = m.get(key);
-        this.put(key, val);
+        Map.Entry entry = (java.util.Map.Entry) it.next();
+        this.put(entry.getKey(), entry.getValue());
       }
     }