From: Javen O'Neal <onealj@apache.org>
Date: Wed, 19 Oct 2016 06:44:09 +0000 (+0000)
Subject: make code more similar between default case and indexed case
X-Git-Tag: REL_3_16_BETA1~85
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0b7e0b06f1d846796a4a51f855d3d3fdefbd59f8;p=poi.git

make code more similar between default case and indexed case

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1765536 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/src/ooxml/java/org/apache/poi/POIXMLDocumentPart.java b/src/ooxml/java/org/apache/poi/POIXMLDocumentPart.java
index 5d66b30bf6..a321faf8f4 100644
--- a/src/ooxml/java/org/apache/poi/POIXMLDocumentPart.java
+++ b/src/ooxml/java/org/apache/poi/POIXMLDocumentPart.java
@@ -559,9 +559,10 @@ public class POIXMLDocumentPart {
         OPCPackage pkg = packagePart.getPackage();
         
         try {
-            if (descriptor.getDefaultFileName().equals(descriptor.getFileName(9999))) {
+            String name = descriptor.getDefaultFileName();
+            if (name.equals(descriptor.getFileName(9999))) {
                 // Non-index based, check if default is free
-                PackagePartName ppName = PackagingURIHelper.createPartName(descriptor.getDefaultFileName());
+                PackagePartName ppName = PackagingURIHelper.createPartName(name);
                 if (pkg.containPart(ppName)) {
                     // Default name already taken, not index based, nothing free
                     return -1;
@@ -575,8 +576,9 @@ public class POIXMLDocumentPart {
             int idx = minIdx;
             if (minIdx < 0) idx = 1;
             while (idx < 1000) {
-                String name = descriptor.getFileName(idx);
-                if (!pkg.containPart(PackagingURIHelper.createPartName(name))) {
+                name = descriptor.getFileName(idx);
+                PackagePartName ppName = PackagingURIHelper.createPartName(name);
+                if (!pkg.containPart(ppName)) {
                     return idx;
                 }
                 idx++;