Revision: 16701
          http://sourceforge.net/p/gate/code/16701
Author:   ian_roberts
Date:     2013-06-04 14:16:02 +0000 (Tue, 04 Jun 2013)
Log Message:
-----------
Null safety in equals method.

Modified Paths:
--------------
    gate/trunk/src/gate/creole/ontology/Literal.java

Modified: gate/trunk/src/gate/creole/ontology/Literal.java
===================================================================
--- gate/trunk/src/gate/creole/ontology/Literal.java    2013-05-30 16:29:26 UTC 
(rev 16700)
+++ gate/trunk/src/gate/creole/ontology/Literal.java    2013-06-04 14:16:02 UTC 
(rev 16701)
@@ -230,9 +230,12 @@
     if ((this.value == null) && (other.value == null)) {
       return true;
     }
-    if(!this.dataType.equals(other.dataType) ||
-       !this.language.equals(other.language) ||
-       !this.value.equals(other.value)) {
+    if(!(this.dataType == null ?
+          other.dataType == null : this.dataType.equals(other.dataType)) ||
+       !(this.language == null ?
+          other.language == null : this.language.equals(other.language)) ||
+       !(this.value == null ?
+          other.value == null : this.value.equals(other.value))) {
       return false;
     }
     return true;

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
How ServiceNow helps IT people transform IT departments:
1. A cloud service to automate IT design, transition and operations
2. Dashboards that offer high-level views of enterprise services
3. A single system of record for all IT processes
http://p.sf.net/sfu/servicenow-d2d-j
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs

Reply via email to