commit ced87aed0e1e18e7d47a998d153ae405e7028eb8
author Geremy Condra <gcondra@google.com> Tue Mar 05 05:16:40 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 05 05:16:40 2013 +0000
tree 64c475eeeb593845bbd1475704f62b4b4eb4b843
parent 3eb34711cd8b2bdaf1fdbd0dafbcc3d469d338b6
parent 546d3cdd7bdb8ed40c04c28074c35a8cea767265

Merge "Convert mEntries -> entries, fixing the build." into jb-mr1-dev-plus-aosp

luni/src/main/java/java/util/zip/ZipFile.java

diff --git a/luni/src/main/java/java/util/zip/ZipFile.java b/luni/src/main/java/java/util/zip/ZipFile.java
index 5d16f33..172141c 100644
--- a/luni/src/main/java/java/util/zip/ZipFile.java
+++ b/luni/src/main/java/java/util/zip/ZipFile.java
@@ -351,7 +351,7 @@
         for (int i = 0; i < numEntries; ++i) {
             ZipEntry newEntry = new ZipEntry(hdrBuf, bufferedStream);
             String entryName = newEntry.getName();
-            if (mEntries.put(entryName, newEntry) != null) {
+            if (entries.put(entryName, newEntry) != null) {
                 throw new ZipException("Duplicate entry name: " + entryName);
             }
         }