You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by be...@apache.org on 2008/11/14 20:55:59 UTC
svn commit: r714117 - in /labs/vysper/src:
main/java/org/apache/vysper/xmpp/addressing/EntityImpl.java
test/java/org/apache/vysper/xmpp/addressing/EntityConformanceTestCase.java
Author: berndf
Date: Fri Nov 14 11:55:59 2008
New Revision: 714117
URL: http://svn.apache.org/viewvc?rev=714117&view=rev
Log:
[vysper] fix entity equality check
Modified:
labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityImpl.java
labs/vysper/src/test/java/org/apache/vysper/xmpp/addressing/EntityConformanceTestCase.java
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityImpl.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityImpl.java?rev=714117&r1=714116&r2=714117&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityImpl.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityImpl.java Fri Nov 14 11:55:59 2008
@@ -123,12 +123,18 @@
if (domain != null ? !domain.equals(that.getDomain()) : that
.getDomain() != null)
return false;
- if (node != null ? !node.equals(that.getNode())
- : that.getNode() != null)
- return false;
- if (resource != null ? !resource.equals(that.getResource()) : that
- .getResource() != null)
- return false;
+ if (isNodeSet() != that.isNodeSet()) return false;
+ if (isNodeSet()) {
+ if (node != null ? !node.equals(that.getNode())
+ : that.getNode() != null)
+ return false;
+ }
+ if (isResourceSet() != that.isResourceSet()) return false;
+ if (isResourceSet()) {
+ if (resource != null ? !resource.equals(that.getResource()) : that
+ .getResource() != null)
+ return false;
+ }
return true;
}
Modified: labs/vysper/src/test/java/org/apache/vysper/xmpp/addressing/EntityConformanceTestCase.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/test/java/org/apache/vysper/xmpp/addressing/EntityConformanceTestCase.java?rev=714117&r1=714116&r2=714117&view=diff
==============================================================================
--- labs/vysper/src/test/java/org/apache/vysper/xmpp/addressing/EntityConformanceTestCase.java (original)
+++ labs/vysper/src/test/java/org/apache/vysper/xmpp/addressing/EntityConformanceTestCase.java Fri Nov 14 11:55:59 2008
@@ -40,4 +40,10 @@
Arrays.fill(chars, 'x');
return new String(chars);
}
+
+ public void testEquals() {
+ assertEquals(new EntityImpl(null, "vysper.org", null), new EntityImpl(null, "vysper.org", ""));
+ assertEquals(new EntityImpl(null, "vysper.org", null), new EntityImpl("", "vysper.org", null));
+ assertEquals(new EntityImpl(null, "vysper.org", null), new EntityImpl("", "vysper.org", ""));
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org