fixed NullPointer exception in org.postgis.Geometry.equals()

git-svn-id: http://svn.osgeo.org/postgis/trunk@2495 b70326c6-7e19-0410-871a-916f4a2858ee

CHANGES

@@ -2,6 +2,7 @@ PostGIS 1.1.5-CVS
 
 	- Java:
 		- Removed obsolete synchronization from Jts code.
+		- fixed nullpointer Exception in Geometry.equals() method
 
 PostGIS 1.1.4
 

java/jdbc/src/org/postgis/Geometry.java

@@ -145,15 +145,13 @@ public boolean equals(Object other) {
      * values
      */
     public boolean equals(Geometry other) {
-        boolean firstline = (other != null) && (this.dimension == other.dimension)
-                && (this.type == other.type);
-        boolean sridequals = (this.srid == other.srid);
-        boolean measEquals = (this.haveMeasure == other.haveMeasure);
-        boolean secondline = sridequals && measEquals;
-        boolean classequals = other.getClass().equals(this.getClass());
-        boolean equalsintern = this.equalsintern(other);
-        boolean result = firstline && secondline && classequals && equalsintern;
-        return result;
+        return (other != null) 
+                && (this.dimension == other.dimension)
+                && (this.type == other.type)
+                && (this.srid == other.srid) 
+                && (this.haveMeasure == other.haveMeasure) 
+                && other.getClass().equals(this.getClass()) 
+                && this.equalsintern(other);
     }
 
     /**