Return-Path: Delivered-To: apmail-ws-scout-dev-archive@www.apache.org Received: (qmail 29921 invoked from network); 11 Feb 2005 04:04:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 11 Feb 2005 04:04:49 -0000 Received: (qmail 5006 invoked by uid 500); 11 Feb 2005 04:04:49 -0000 Delivered-To: apmail-ws-scout-dev-archive@ws.apache.org Received: (qmail 4981 invoked by uid 500); 11 Feb 2005 04:04:49 -0000 Mailing-List: contact scout-dev-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: scout-dev@ws.apache.org Delivered-To: mailing list scout-dev@ws.apache.org Received: (qmail 4959 invoked by uid 500); 11 Feb 2005 04:04:49 -0000 Delivered-To: apmail-ws-scout-cvs@ws.apache.org Received: (qmail 4953 invoked by uid 99); 11 Feb 2005 04:04:49 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Thu, 10 Feb 2005 20:04:49 -0800 Received: (qmail 29918 invoked by uid 65534); 11 Feb 2005 04:04:48 -0000 Message-ID: <20050211040448.29917.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Fri, 11 Feb 2005 04:04:47 -0000 Subject: svn commit: r153342 - webservices/scout/trunk/modules/scout/src/java/org/apache/ws/scout/util/ScoutJaxrUddiHelper.java To: scout-cvs@ws.apache.org From: geirm@apache.org X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: geirm Date: Thu Feb 10 20:04:46 2005 New Revision: 153342 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D153342 Log: be defensive :) Modified: webservices/scout/trunk/modules/scout/src/java/org/apache/ws/scout/util= /ScoutJaxrUddiHelper.java Modified: webservices/scout/trunk/modules/scout/src/java/org/apache/ws/scou= t/util/ScoutJaxrUddiHelper.java URL: http://svn.apache.org/viewcvs/webservices/scout/trunk/modules/scout/sr= c/java/org/apache/ws/scout/util/ScoutJaxrUddiHelper.java?view=3Ddiff&r1=3D1= 53341&r2=3D153342 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- webservices/scout/trunk/modules/scout/src/java/org/apache/ws/scout/util= /ScoutJaxrUddiHelper.java (original) +++ webservices/scout/trunk/modules/scout/src/java/org/apache/ws/scout/util= /ScoutJaxrUddiHelper.java Thu Feb 10 20:04:46 2005 @@ -292,8 +292,10 @@ /* * first do primary, and then filter that out in the loop */ - Contact ct =3D getContactFromJAXRUser(primaryContact); - cvect.add(ct); + if (primaryContact !=3D null) { + Contact ct =3D getContactFromJAXRUser(primaryContact); + cvect.add(ct); + } =20 Iterator it =3D users.iterator(); while (it.hasNext()) @@ -301,7 +303,7 @@ User u =3D (User) it.next(); =20 if (u !=3D primaryContact) { - ct =3D getContactFromJAXRUser(u); + Contact ct =3D getContactFromJAXRUser(u); cvect.add(ct); } } @@ -328,12 +330,20 @@ } =20 /** + * TODO - should we really return new Contact() rather than null on + * null input? + * * Convert JAXR User Object to UDDI Contact */ public static Contact getContactFromJAXRUser(User user) throws JAXRException { Contact ct =3D new Contact(); + + if (user =3D=3D null) { + return ct; + } + Vector addvect =3D new Vector(); Vector phonevect =3D new Vector(); Vector emailvect =3D new Vector(); --------------------------------------------------------------------- To unsubscribe, e-mail: scout-dev-unsubscribe@ws.apache.org For additional commands, e-mail: scout-dev-help@ws.apache.org