svn commit: r1765935 - in /poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc: OPCPackage.java PackagePart.java

[onealj]

Author: onealj
Date: Fri Oct 21 07:29:40 2016
New Revision: 1765935

URL: http://svn.apache.org/viewvc?rev=1765935&view=rev
Log:
bug 60288: remove defensive copy for internal relationships. Patch from Tim 
Helmstedt. This closes #38.

Modified:
    poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java
    poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePart.java

Modified: poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java?rev=1765935&r1=1765934&r2=1765935&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java 
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java Fri 
Oct 21 07:29:40 2016
@@ -1409,7 +1409,7 @@ public abstract class OPCPackage impleme
         */
        @Override
     public boolean isRelationshipExists(PackageRelationship rel) {
-        for (PackageRelationship r : this.getRelationships()) {
+        for (PackageRelationship r : relationships) {
             if (r == rel) {
                 return true;
             }

Modified: poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePart.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePart.java?rev=1765935&r1=1765934&r2=1765935&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePart.java 
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePart.java Fri 
Oct 21 07:29:40 2016
@@ -447,12 +447,9 @@ public abstract class PackagePart implem
         * @see 
org.apache.poi.openxml4j.opc.RelationshipSource#isRelationshipExists(org.apache.poi.openxml4j.opc.PackageRelationship)
         */
        public boolean isRelationshipExists(PackageRelationship rel) {
-        try {
-            for (PackageRelationship r : this.getRelationships()) {
-                if (r == rel)
-                    return true;
-            }
-        } catch (InvalidFormatException e){
+               for (PackageRelationship r : _relationships) {
+                       if (r == rel)
+                               return true;
                }
         return false;
        }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org