You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by ks...@apache.org on 2012/02/29 15:22:29 UTC

svn commit: r1295125 - /juddi/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiV3Helper.java

Author: kstam
Date: Wed Feb 29 14:22:29 2012
New Revision: 1295125

URL: http://svn.apache.org/viewvc?rev=1295125&view=rev
Log:
SCOUT-129, setting bags to null if they are empty, and switching to assuming a Concept rather then a SpecificationLink in the specifications Collection.

Modified:
    juddi/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiV3Helper.java

Modified: juddi/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiV3Helper.java
URL: http://svn.apache.org/viewvc/juddi/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiV3Helper.java?rev=1295125&r1=1295124&r2=1295125&view=diff
==============================================================================
--- juddi/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiV3Helper.java (original)
+++ juddi/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiV3Helper.java Wed Feb 29 14:22:29 2012
@@ -833,7 +833,8 @@ public class ScoutJaxrUddiV3Helper 
     				}
                 }
 			}
-			return cbag;
+			if (cbag.getKeyedReference().isEmpty()) return null;
+			else return cbag;
     	} catch (Exception ud) {
 			throw new JAXRException("Apache JAXR Impl:", ud);
 		}
@@ -849,20 +850,25 @@ public class ScoutJaxrUddiV3Helper 
 			Iterator speciter = specifications.iterator();
 			while (speciter.hasNext()) {
 				RegistryObject registryobject = (RegistryObject) speciter.next();
-				if (registryobject instanceof SpecificationLink) {
-					SpecificationLink specificationlink = (SpecificationLink) registryobject;
-					if (specificationlink.getSpecificationObject() != null) {
-						RegistryObject ro = specificationlink.getSpecificationObject();
-						if (ro.getKey() != null) {
-							Key key = ro.getKey();
-							tbag.getTModelKey().add(key.toString());
-						}
-					}
+				if (registryobject instanceof Concept) {
+				    Concept concept = (Concept) registryobject;
+				    if (concept.getKey() != null) {
+				        tbag.getTModelKey().add(concept.getKey().toString());
+				    }
+//					SpecificationLink specificationlink = (SpecificationLink) registryobject;
+//					if (specificationlink.getSpecificationObject() != null) {
+//						RegistryObject ro = specificationlink.getSpecificationObject();
+//						if (ro.getKey() != null) {
+//							Key key = ro.getKey();
+//							tbag.getTModelKey().add(key.toString());
+//						}
+//					}
 				} else {
 					log.info("ebXML case - the RegistryObject is an ExtrinsicObject, Not implemented");
 				}
 			}
-			return tbag;
+			if (tbag.getTModelKey().isEmpty()) return null;
+			else return tbag;
     	} catch (Exception ud) {
 			throw new JAXRException("Apache JAXR Impl:", ud);
 		}



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org