xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adelme...@apache.org
Subject svn commit: r1716743 - /xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPResourceInfo.java
Date Thu, 26 Nov 2015 16:53:00 GMT
Author: adelmelle
Date: Thu Nov 26 16:53:00 2015
New Revision: 1716743

URL: http://svn.apache.org/viewvc?rev=1716743&view=rev
Log:
FOP-2455b - Applied updated patch in addition to the original one (see: r1716732)

Modified:
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPResourceInfo.java

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPResourceInfo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPResourceInfo.java?rev=1716743&r1=1716742&r2=1716743&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPResourceInfo.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPResourceInfo.java Thu Nov 26 16:53:00
2015
@@ -158,10 +158,10 @@ public class AFPResourceInfo {
         }
 
         AFPResourceInfo ri = (AFPResourceInfo)obj;
-        return (uri != null && uri.equals(ri.uri))
-            && (imageDimension == ri.imageDimension || imageDimension != null &&
imageDimension.equals(ri.imageDimension))
-            && (name != null && name.equals(ri.name))
-            && (level != null && level.equals(ri.level));
+        return (uri == ri.uri || uri != null && uri.equals(ri.uri))
+                && (imageDimension == ri.imageDimension ||imageDimension != null
&& imageDimension.equals(ri.imageDimension))
+                && (name == ri.name ||name != null && name.equals(ri.name))
+                && (level == ri.level ||level != null && level.equals(ri.level));
     }
 
     /** {@inheritDoc} */



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org


Mime
View raw message