You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by sv...@apache.org on 2005/03/15 03:22:42 UTC
cvs commit: ws-juddi/src/java/org/apache/juddi/handler FindTModelHandler.java PublisherInfoHandler.java BusinessEntityHandler.java BindingTemplateHandler.java BusinessServiceHandler.java FindServiceHandler.java RelatedBusinessInfoHandler.java NameHandler.java FindBusinessHandler.java InstanceDetailsHandler.java TModelHandler.java TModelInstanceInfoHandler.java BusinessInfoHandler.java ServiceInfoHandler.java DescriptionHandler.java SubscriptionHandler.java ContactHandler.java TModelInfoHandler.java OverviewDocHandler.java FindPublisherHandler.java
sviens 2005/03/14 18:22:42
Modified: src/java/org/apache/juddi/handler FindTModelHandler.java
PublisherInfoHandler.java
BusinessEntityHandler.java
BindingTemplateHandler.java
BusinessServiceHandler.java FindServiceHandler.java
RelatedBusinessInfoHandler.java NameHandler.java
FindBusinessHandler.java
InstanceDetailsHandler.java TModelHandler.java
TModelInstanceInfoHandler.java
BusinessInfoHandler.java ServiceInfoHandler.java
DescriptionHandler.java SubscriptionHandler.java
ContactHandler.java TModelInfoHandler.java
OverviewDocHandler.java FindPublisherHandler.java
Log:
Fix for bug# JUDDI-64 - BindingTemplate does not check empty description (see: http://issues.apache.org/jira/browse/JUDDI-64 )
Revision Changes Path
1.5 +3 -1 ws-juddi/src/java/org/apache/juddi/handler/FindTModelHandler.java
Index: FindTModelHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/FindTModelHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FindTModelHandler.java 8 Mar 2005 03:17:02 -0000 1.4
+++ FindTModelHandler.java 15 Mar 2005 02:22:41 -0000 1.5
@@ -71,7 +71,9 @@
if (nodeList.size() > 0)
{
handler = maker.lookup(NameHandler.TAG_NAME);
- obj.setName((Name)handler.unmarshal((Element)nodeList.elementAt(0)));
+ Name name = (Name )handler.unmarshal((Element)nodeList.elementAt(0));
+ if (name != null)
+ obj.setName(name);
}
nodeList = XMLUtils.getChildElementsByTagName(element,FindQualifiersHandler.TAG_NAME);
1.5 +3 -1 ws-juddi/src/java/org/apache/juddi/handler/PublisherInfoHandler.java
Index: PublisherInfoHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/PublisherInfoHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PublisherInfoHandler.java 8 Mar 2005 03:17:02 -0000 1.4
+++ PublisherInfoHandler.java 15 Mar 2005 02:22:41 -0000 1.5
@@ -57,7 +57,9 @@
if (nodeList.size() > 0)
{
handler = maker.lookup(NameHandler.TAG_NAME);
- obj.setName((Name)handler.unmarshal((Element)nodeList.elementAt(0)));
+ Name name = (Name )handler.unmarshal((Element)nodeList.elementAt(0));
+ if (name != null)
+ obj.setName(name);
}
return obj;
1.7 +6 -2 ws-juddi/src/java/org/apache/juddi/handler/BusinessEntityHandler.java
Index: BusinessEntityHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/BusinessEntityHandler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BusinessEntityHandler.java 8 Mar 2005 03:17:02 -0000 1.6
+++ BusinessEntityHandler.java 15 Mar 2005 02:22:41 -0000 1.7
@@ -82,14 +82,18 @@
for (int i=0; i<nodeList.size(); i++)
{
handler = maker.lookup(NameHandler.TAG_NAME);
- obj.addName((Name)handler.unmarshal((Element)nodeList.elementAt(i)));
+ Name name = (Name )handler.unmarshal((Element)nodeList.elementAt(i));
+ if (name != null)
+ obj.addName(name);
}
nodeList = XMLUtils.getChildElementsByTagName(element,DescriptionHandler.TAG_NAME);
for (int i=0; i<nodeList.size(); i++)
{
handler = maker.lookup(DescriptionHandler.TAG_NAME);
- obj.addDescription((Description)handler.unmarshal((Element)nodeList.elementAt(i)));
+ Description descr = (Description)handler.unmarshal((Element)nodeList.elementAt(i));
+ if (descr != null)
+ obj.addDescription(descr);
}
nodeList = XMLUtils.getChildElementsByTagName(element,DiscoveryURLsHandler.TAG_NAME);
1.8 +3 -1 ws-juddi/src/java/org/apache/juddi/handler/BindingTemplateHandler.java
Index: BindingTemplateHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/BindingTemplateHandler.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BindingTemplateHandler.java 8 Mar 2005 03:17:02 -0000 1.7
+++ BindingTemplateHandler.java 15 Mar 2005 02:22:41 -0000 1.8
@@ -62,7 +62,9 @@
for (int i=0; i<nodeList.size(); i++)
{
handler = maker.lookup(DescriptionHandler.TAG_NAME);
- obj.addDescription((Description)handler.unmarshal((Element)nodeList.elementAt(i)));
+ Description descr = (Description)handler.unmarshal((Element)nodeList.elementAt(i));
+ if (descr != null)
+ obj.addDescription(descr);
}
nodeList = XMLUtils.getChildElementsByTagName(element,AccessPointHandler.TAG_NAME);
1.7 +6 -2 ws-juddi/src/java/org/apache/juddi/handler/BusinessServiceHandler.java
Index: BusinessServiceHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/BusinessServiceHandler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BusinessServiceHandler.java 8 Mar 2005 03:17:02 -0000 1.6
+++ BusinessServiceHandler.java 15 Mar 2005 02:22:41 -0000 1.7
@@ -68,14 +68,18 @@
for (int i=0; i<nodeList.size(); i++)
{
handler = maker.lookup(NameHandler.TAG_NAME);
- obj.addName((Name)handler.unmarshal((Element)nodeList.elementAt(i)));
+ Name name = (Name )handler.unmarshal((Element)nodeList.elementAt(i));
+ if (name != null)
+ obj.addName(name);
}
nodeList = XMLUtils.getChildElementsByTagName(element,DescriptionHandler.TAG_NAME);
for (int i=0; i<nodeList.size(); i++)
{
handler = maker.lookup(DescriptionHandler.TAG_NAME);
- obj.addDescription((Description)handler.unmarshal((Element)nodeList.elementAt(i)));
+ Description descr = (Description)handler.unmarshal((Element)nodeList.elementAt(i));
+ if (descr != null)
+ obj.addDescription(descr);
}
nodeList = XMLUtils.getChildElementsByTagName(element,BindingTemplatesHandler.TAG_NAME);
1.5 +3 -1 ws-juddi/src/java/org/apache/juddi/handler/FindServiceHandler.java
Index: FindServiceHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/FindServiceHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FindServiceHandler.java 8 Mar 2005 03:17:02 -0000 1.4
+++ FindServiceHandler.java 15 Mar 2005 02:22:41 -0000 1.5
@@ -76,7 +76,9 @@
for (int i=0; i<nodeList.size(); i++)
{
handler = maker.lookup(NameHandler.TAG_NAME);
- obj.addName((Name)handler.unmarshal((Element)nodeList.elementAt(i)));
+ Name name = (Name )handler.unmarshal((Element)nodeList.elementAt(i));
+ if (name != null)
+ obj.addName(name);
}
nodeList = XMLUtils.getChildElementsByTagName(element,FindQualifiersHandler.TAG_NAME);
1.5 +6 -2 ws-juddi/src/java/org/apache/juddi/handler/RelatedBusinessInfoHandler.java
Index: RelatedBusinessInfoHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/RelatedBusinessInfoHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RelatedBusinessInfoHandler.java 8 Mar 2005 03:17:02 -0000 1.4
+++ RelatedBusinessInfoHandler.java 15 Mar 2005 02:22:41 -0000 1.5
@@ -65,14 +65,18 @@
for (int i=0; i<nodeList.size(); i++)
{
handler = maker.lookup(NameHandler.TAG_NAME);
- obj.addName((org.apache.juddi.datatype.Name)handler.unmarshal((Element)nodeList.elementAt(i)));
+ Name name = (Name )handler.unmarshal((Element)nodeList.elementAt(i));
+ if (name != null)
+ obj.addName(name);
}
nodeList = XMLUtils.getChildElementsByTagName(element,DescriptionHandler.TAG_NAME);
for (int i=0; i<nodeList.size(); i++)
{
handler = maker.lookup(DescriptionHandler.TAG_NAME);
- obj.addDescription((Description)handler.unmarshal((Element)nodeList.elementAt(i)));
+ Description descr = (Description)handler.unmarshal((Element)nodeList.elementAt(i));
+ if (descr != null)
+ obj.addDescription(descr);
}
nodeList = XMLUtils.getChildElementsByTagName(element,SharedRelationshipsHandler.TAG_NAME);
1.5 +7 -6 ws-juddi/src/java/org/apache/juddi/handler/NameHandler.java
Index: NameHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/NameHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NameHandler.java 8 Mar 2005 03:17:02 -0000 1.4
+++ NameHandler.java 15 Mar 2005 02:22:41 -0000 1.5
@@ -39,20 +39,21 @@
}
public RegistryObject unmarshal(Element element)
- {
- Name obj = new Name();
-
+ {
// Attributes
String langCode = element.getAttribute("xml:lang");
- if ((langCode != null) && (langCode.trim().length() > 0))
- obj.setLanguageCode(langCode);
// Text Node Value
- obj.setValue(XMLUtils.getText(element));
+ String nameValue = XMLUtils.getText(element);
// Child Elements
// {none}
+ // Only create Name instance if nameValue not null and not zero-length
+ Name obj = null;
+ if ((nameValue != null) && (nameValue.trim().length() > 0))
+ obj = new Name(nameValue,langCode);
+
return obj;
}
1.5 +21 -20 ws-juddi/src/java/org/apache/juddi/handler/FindBusinessHandler.java
Index: FindBusinessHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/FindBusinessHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FindBusinessHandler.java 8 Mar 2005 03:17:03 -0000 1.4
+++ FindBusinessHandler.java 15 Mar 2005 02:22:41 -0000 1.5
@@ -71,34 +71,35 @@
// {none}
// Child Elements
-
- nodeList = XMLUtils.getChildElementsByTagName(element,FindQualifiersHandler.TAG_NAME);
- if (nodeList.size() > 0)
- {
- handler = maker.lookup(FindQualifiersHandler.TAG_NAME);
- obj.setFindQualifiers((FindQualifiers)handler.unmarshal((Element)nodeList.elementAt(0)));
- }
+ nodeList = XMLUtils.getChildElementsByTagName(element,FindQualifiersHandler.TAG_NAME);
+ if (nodeList.size() > 0)
+ {
+ handler = maker.lookup(FindQualifiersHandler.TAG_NAME);
+ obj.setFindQualifiers((FindQualifiers)handler.unmarshal((Element)nodeList.elementAt(0)));
+ }
nodeList = XMLUtils.getChildElementsByTagName(element,NameHandler.TAG_NAME);
for (int i=0; i<nodeList.size(); i++)
{
handler = maker.lookup(NameHandler.TAG_NAME);
- obj.addName((Name)handler.unmarshal((Element)nodeList.elementAt(i)));
+ Name name = (Name )handler.unmarshal((Element)nodeList.elementAt(i));
+ if (name != null)
+ obj.addName(name);
}
- nodeList = XMLUtils.getChildElementsByTagName(element,IdentifierBagHandler.TAG_NAME);
- if (nodeList.size() > 0)
- {
- handler = maker.lookup(IdentifierBagHandler.TAG_NAME);
- obj.setIdentifierBag((IdentifierBag)handler.unmarshal((Element)nodeList.elementAt(0)));
- }
+ nodeList = XMLUtils.getChildElementsByTagName(element,IdentifierBagHandler.TAG_NAME);
+ if (nodeList.size() > 0)
+ {
+ handler = maker.lookup(IdentifierBagHandler.TAG_NAME);
+ obj.setIdentifierBag((IdentifierBag)handler.unmarshal((Element)nodeList.elementAt(0)));
+ }
- nodeList = XMLUtils.getChildElementsByTagName(element,CategoryBagHandler.TAG_NAME);
- if (nodeList.size() > 0)
- {
- handler = maker.lookup(CategoryBagHandler.TAG_NAME);
- obj.setCategoryBag((CategoryBag)handler.unmarshal((Element)nodeList.elementAt(0)));
- }
+ nodeList = XMLUtils.getChildElementsByTagName(element,CategoryBagHandler.TAG_NAME);
+ if (nodeList.size() > 0)
+ {
+ handler = maker.lookup(CategoryBagHandler.TAG_NAME);
+ obj.setCategoryBag((CategoryBag)handler.unmarshal((Element)nodeList.elementAt(0)));
+ }
nodeList = XMLUtils.getChildElementsByTagName(element,TModelBagHandler.TAG_NAME);
if (nodeList.size() > 0)
1.5 +3 -1 ws-juddi/src/java/org/apache/juddi/handler/InstanceDetailsHandler.java
Index: InstanceDetailsHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/InstanceDetailsHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InstanceDetailsHandler.java 8 Mar 2005 03:17:02 -0000 1.4
+++ InstanceDetailsHandler.java 15 Mar 2005 02:22:41 -0000 1.5
@@ -59,7 +59,9 @@
for (int i=0; i<nodeList.size(); i++)
{
handler = maker.lookup(DescriptionHandler.TAG_NAME);
- obj.addDescription((Description)handler.unmarshal((Element)nodeList.elementAt(i)));
+ Description descr = (Description)handler.unmarshal((Element)nodeList.elementAt(i));
+ if (descr != null)
+ obj.addDescription(descr);
}
nodeList = XMLUtils.getChildElementsByTagName(element,OverviewDocHandler.TAG_NAME);
1.7 +6 -2 ws-juddi/src/java/org/apache/juddi/handler/TModelHandler.java
Index: TModelHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/TModelHandler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TModelHandler.java 8 Mar 2005 03:17:02 -0000 1.6
+++ TModelHandler.java 15 Mar 2005 02:22:41 -0000 1.7
@@ -64,14 +64,18 @@
if (nodeList.size() > 0)
{
handler = maker.lookup(NameHandler.TAG_NAME);
- obj.setName((Name)handler.unmarshal((Element)nodeList.elementAt(0)));
+ Name name = (Name )handler.unmarshal((Element)nodeList.elementAt(0));
+ if (name != null)
+ obj.setName(name);
}
nodeList = XMLUtils.getChildElementsByTagName(element,DescriptionHandler.TAG_NAME);
for (int i=0; i<nodeList.size(); i++)
{
handler = maker.lookup(DescriptionHandler.TAG_NAME);
- obj.addDescription((Description)handler.unmarshal((Element)nodeList.elementAt(i)));
+ Description descr = (Description)handler.unmarshal((Element)nodeList.elementAt(i));
+ if (descr != null)
+ obj.addDescription(descr);
}
nodeList = XMLUtils.getChildElementsByTagName(element,OverviewDocHandler.TAG_NAME);
1.5 +3 -1 ws-juddi/src/java/org/apache/juddi/handler/TModelInstanceInfoHandler.java
Index: TModelInstanceInfoHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/TModelInstanceInfoHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TModelInstanceInfoHandler.java 8 Mar 2005 03:17:03 -0000 1.4
+++ TModelInstanceInfoHandler.java 15 Mar 2005 02:22:41 -0000 1.5
@@ -56,7 +56,9 @@
for (int i=0; i<nodeList.size(); i++)
{
handler = maker.lookup(DescriptionHandler.TAG_NAME);
- obj.addDescription((Description)handler.unmarshal((Element)nodeList.elementAt(i)));
+ Description descr = (Description)handler.unmarshal((Element)nodeList.elementAt(i));
+ if (descr != null)
+ obj.addDescription(descr);
}
nodeList = XMLUtils.getChildElementsByTagName(element,InstanceDetailsHandler.TAG_NAME);
1.4 +7 -2 ws-juddi/src/java/org/apache/juddi/handler/BusinessInfoHandler.java
Index: BusinessInfoHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/BusinessInfoHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BusinessInfoHandler.java 6 Feb 2005 02:52:07 -0000 1.3
+++ BusinessInfoHandler.java 15 Mar 2005 02:22:41 -0000 1.4
@@ -18,6 +18,7 @@
import java.util.Vector;
import org.apache.juddi.datatype.Description;
+import org.apache.juddi.datatype.Name;
import org.apache.juddi.datatype.RegistryObject;
import org.apache.juddi.datatype.response.BusinessInfo;
import org.apache.juddi.datatype.response.ServiceInfos;
@@ -58,14 +59,18 @@
for (int i=0; i<nodeList.size(); i++)
{
handler = maker.lookup(NameHandler.TAG_NAME);
- obj.addName((org.apache.juddi.datatype.Name)handler.unmarshal((Element)nodeList.elementAt(i)));
+ Name name = (Name )handler.unmarshal((Element)nodeList.elementAt(i));
+ if (name != null)
+ obj.addName(name);
}
nodeList = XMLUtils.getChildElementsByTagName(element,DescriptionHandler.TAG_NAME);
for (int i=0; i<nodeList.size(); i++)
{
handler = maker.lookup(DescriptionHandler.TAG_NAME);
- obj.addDescription((Description)handler.unmarshal((Element)nodeList.elementAt(i)));
+ Description descr = (Description)handler.unmarshal((Element)nodeList.elementAt(i));
+ if (descr != null)
+ obj.addDescription(descr);
}
nodeList = XMLUtils.getChildElementsByTagName(element,ServiceInfosHandler.TAG_NAME);
1.6 +3 -1 ws-juddi/src/java/org/apache/juddi/handler/ServiceInfoHandler.java
Index: ServiceInfoHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/ServiceInfoHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ServiceInfoHandler.java 8 Mar 2005 03:17:02 -0000 1.5
+++ ServiceInfoHandler.java 15 Mar 2005 02:22:41 -0000 1.6
@@ -58,7 +58,9 @@
for (int i=0; i<nodeList.size(); i++)
{
handler = maker.lookup(NameHandler.TAG_NAME);
- obj.addName((Name)handler.unmarshal((Element)nodeList.elementAt(i)));
+ Name name = (Name )handler.unmarshal((Element)nodeList.elementAt(i));
+ if (name != null)
+ obj.addName(name);
}
return obj;
1.5 +7 -6 ws-juddi/src/java/org/apache/juddi/handler/DescriptionHandler.java
Index: DescriptionHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/DescriptionHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DescriptionHandler.java 8 Mar 2005 03:17:02 -0000 1.4
+++ DescriptionHandler.java 15 Mar 2005 02:22:41 -0000 1.5
@@ -38,20 +38,21 @@
}
public RegistryObject unmarshal(Element element)
- {
- Description obj = new Description();
-
+ {
// Attributes
String langCode = element.getAttribute("xml:lang");
- if ((langCode != null) && (langCode.trim().length() > 0))
- obj.setLanguageCode(langCode);
// Text Node Value
- obj.setValue(XMLUtils.getText(element));
+ String descValue = XMLUtils.getText(element);
// Child Elements
// {none}
+ // Only create Description instance if descValue not null and not zero-length
+ Description obj = null;
+ if ((descValue != null) && (descValue.trim().length() > 0))
+ obj = new Description(descValue,langCode);
+
return obj;
}
1.5 +2 -5 ws-juddi/src/java/org/apache/juddi/handler/SubscriptionHandler.java
Index: SubscriptionHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/SubscriptionHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SubscriptionHandler.java 8 Mar 2005 03:22:08 -0000 1.4
+++ SubscriptionHandler.java 15 Mar 2005 02:22:41 -0000 1.5
@@ -44,6 +44,8 @@
public RegistryObject unmarshal(Element element)
{
+ // TODO (UDDI v3) Fill out SubscriptoinHandler.unmarshal()
+
Subscription obj = new Subscription();
Vector nodeList = null;
AbstractHandler handler = null;
@@ -55,11 +57,6 @@
// [none]
// Child Elements
- nodeList = XMLUtils.getChildElementsByTagName(element,NameHandler.TAG_NAME);
- if (nodeList.size() > 0)
- {
- // TODO (UDDI v3) Fill out SubscriptoinHandler.unmarshal()
- }
return obj;
}
1.5 +3 -1 ws-juddi/src/java/org/apache/juddi/handler/ContactHandler.java
Index: ContactHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/ContactHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ContactHandler.java 8 Mar 2005 03:17:02 -0000 1.4
+++ ContactHandler.java 15 Mar 2005 02:22:41 -0000 1.5
@@ -74,7 +74,9 @@
for (int i=0; i<nodeList.size(); i++)
{
handler = maker.lookup(DescriptionHandler.TAG_NAME);
- obj.addDescription((Description)handler.unmarshal((Element)nodeList.elementAt(i)));
+ Description descr = (Description)handler.unmarshal((Element)nodeList.elementAt(i));
+ if (descr != null)
+ obj.addDescription(descr);
}
nodeList = XMLUtils.getChildElementsByTagName(element,AddressHandler.TAG_NAME);
1.5 +3 -1 ws-juddi/src/java/org/apache/juddi/handler/TModelInfoHandler.java
Index: TModelInfoHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/TModelInfoHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TModelInfoHandler.java 8 Mar 2005 03:17:02 -0000 1.4
+++ TModelInfoHandler.java 15 Mar 2005 02:22:41 -0000 1.5
@@ -56,7 +56,9 @@
if (nodeList.size() > 0)
{
handler = maker.lookup(NameHandler.TAG_NAME);
- obj.setName((Name)handler.unmarshal((Element)nodeList.elementAt(0)));
+ Name name = (Name )handler.unmarshal((Element)nodeList.elementAt(0));
+ if (name != null)
+ obj.setName(name);
}
return obj;
1.7 +3 -1 ws-juddi/src/java/org/apache/juddi/handler/OverviewDocHandler.java
Index: OverviewDocHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/OverviewDocHandler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- OverviewDocHandler.java 8 Mar 2005 03:17:03 -0000 1.6
+++ OverviewDocHandler.java 15 Mar 2005 02:22:41 -0000 1.7
@@ -58,7 +58,9 @@
for (int i=0; i<nodeList.size(); i++)
{
handler = maker.lookup(DescriptionHandler.TAG_NAME);
- obj.addDescription((Description)handler.unmarshal((Element)nodeList.elementAt(i)));
+ Description descr = (Description)handler.unmarshal((Element)nodeList.elementAt(i));
+ if (descr != null)
+ obj.addDescription(descr);
}
nodeList = XMLUtils.getChildElementsByTagName(element,OverviewURLHandler.TAG_NAME);
1.5 +3 -1 ws-juddi/src/java/org/apache/juddi/handler/FindPublisherHandler.java
Index: FindPublisherHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/FindPublisherHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FindPublisherHandler.java 8 Mar 2005 03:17:02 -0000 1.4
+++ FindPublisherHandler.java 15 Mar 2005 02:22:41 -0000 1.5
@@ -65,7 +65,9 @@
if (nodeList.size() > 0)
{
handler = maker.lookup(NameHandler.TAG_NAME);
- obj.setName((Name)handler.unmarshal((Element)nodeList.elementAt(0)));
+ Name name = (Name )handler.unmarshal((Element)nodeList.elementAt(0));
+ if (name != null)
+ obj.setName(name);
}
nodeList = XMLUtils.getChildElementsByTagName(element,FindQualifiersHandler.TAG_NAME);