[folks] e-d-s: don't instantiate WebServiceFieldDetails with null values



commit 9d28ee42ff7809698ae0ed35b74c2ae08882b404
Author: Raul Gutierrez Segales <rgs collabora co uk>
Date:   Wed Sep 7 11:55:08 2011 +0100

    e-d-s: don't instantiate WebServiceFieldDetails with null values
    
    Helps: https://bugzilla.gnome.org/show_bug.cgi?id=658327

 tests/eds/link-personas.vala |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/tests/eds/link-personas.vala b/tests/eds/link-personas.vala
index ba6afe9..6dd1bb8 100644
--- a/tests/eds/link-personas.vala
+++ b/tests/eds/link-personas.vala
@@ -412,15 +412,15 @@ public class LinkPersonasTests : Folks.TestCase
                   var ws_fds = i.web_service_addresses.get (service);
                   foreach (var ws_fd in ws_fds)
                     {
-                      if (ws_fd.equal (
-                            new WebServiceFieldDetails (
-                                this._linking_props.get ("prop1"))))
+                      var prop1 = this._linking_props.get ("prop1");
+                      var prop2 = this._linking_props.get ("prop2");
+                      if (prop1 != null &&
+                          ws_fd.equal (new WebServiceFieldDetails (prop1)))
                         {
                           this._linking_props.unset ("prop1");
                         }
-                      else if (ws_fd.equal (
-                            new WebServiceFieldDetails (
-                                this._linking_props.get ("prop2"))))
+                      else if (prop2 != null &&
+                          ws_fd.equal (new WebServiceFieldDetails (prop2)))
                         {
                           this._linking_props.unset ("prop2");
                         }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]