empire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From doeb...@apache.org
Subject svn commit: r1367461 - /empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java
Date Tue, 31 Jul 2012 08:38:34 GMT
Author: doebele
Date: Tue Jul 31 08:38:34 2012
New Revision: 1367461

URL: http://svn.apache.org/viewvc?rev=1367461&view=rev
Log:
EMPIREDB-141
bugfix for DBRowSet equals()

Modified:
    empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java

Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java?rev=1367461&r1=1367460&r2=1367461&view=diff
==============================================================================
--- empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java (original)
+++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java Tue Jul 31
08:38:34 2012
@@ -192,8 +192,11 @@ public abstract class DBRowSet extends D
             DBRowSet r = (DBRowSet) other; 
             if (db.equals(r.getDatabase())==false)
                 return false;
+            // Check Alias
+            if (getAlias()==null)
+                return super.equals(other);
             // check for equal names
-            return StringUtils.compareEqual(getName(), r.getName(), true);
+            return StringUtils.compareEqual(getAlias(), r.getAlias(), true);
         }
         return false;
     }



Mime
View raw message