You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ca...@apache.org on 2007/10/19 18:55:37 UTC
svn commit: r586535 -
/maven/components/branches/maven-2.0.x/maven-model/src/main/mdo/maven.mdo
Author: carlos
Date: Fri Oct 19 09:55:36 2007
New Revision: 586535
URL: http://svn.apache.org/viewvc?rev=586535&view=rev
Log:
[MNG-3240] maven-model RepositoryBase.equals() causes ClassCastException. Merged rev# 586533 from trunk
Modified:
maven/components/branches/maven-2.0.x/maven-model/src/main/mdo/maven.mdo
Modified: maven/components/branches/maven-2.0.x/maven-model/src/main/mdo/maven.mdo
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-model/src/main/mdo/maven.mdo?rev=586535&r1=586534&r2=586535&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-model/src/main/mdo/maven.mdo (original)
+++ maven/components/branches/maven-2.0.x/maven-model/src/main/mdo/maven.mdo Fri Oct 19 09:55:36 2007
@@ -2619,16 +2619,18 @@
*/
public boolean equals( Object obj )
{
- RepositoryBase other = (RepositoryBase) obj;
-
- boolean retValue = false;
-
- if ( id != null )
- {
- retValue = id.equals( other.id );
- }
-
- return retValue;
+ if ( obj instanceof RepositoryBase ) {
+
+ final RepositoryBase other = (RepositoryBase) obj;
+
+ if ( id != null )
+ {
+ return id.equals( other.id );
+ }
+ return super.equals(obj);
+ }
+
+ return false;
}
]]>
</code>