[riftsaw-commits] riftsaw SVN: r1381 - in trunk: runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi and 1 other directory.
Author: kurtstam
Date: 2011-06-10 11:39:46 -0400 (Fri, 10 Jun 2011)
New Revision: 1381
Modified:
trunk/distribution/src/main/release/conf/juddi/riftsaw.uddi.xml
trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java
Log:
RIFTSAW-358 - using InVMTransport by default
Modified: trunk/distribution/src/main/release/conf/juddi/riftsaw.uddi.xml
===================================================================
--- trunk/distribution/src/main/release/conf/juddi/riftsaw.uddi.xml 2011-06-09 17:30:43
UTC (rev 1380)
+++ trunk/distribution/src/main/release/conf/juddi/riftsaw.uddi.xml 2011-06-10 15:39:46
UTC (rev 1381)
@@ -14,6 +14,8 @@
</properties>
<!--In VM Transport Settings
<proxyTransport>org.apache.juddi.v3.client.transport.InVMTransport</proxyTransport>
+ -->
+
<proxyTransport>org.jboss.internal.soa.esb.registry.client.JuddiInVMTransport</proxyTransport>
<custodyTransferUrl>org.apache.juddi.api.impl.UDDICustodyTransferImpl</custodyTransferUrl>
<inquiryUrl>org.apache.juddi.api.impl.UDDIInquiryImpl</inquiryUrl>
<publishUrl>org.apache.juddi.api.impl.UDDIPublicationImpl</publishUrl>
@@ -21,8 +23,8 @@
<subscriptionUrl>org.apache.juddi.api.impl.UDDISubscriptionImpl</subscriptionUrl>
<subscriptionListenerUrl>org.apache.juddi.api.impl.UDDISubscriptionListenerImpl</subscriptionListenerUrl>
<juddiApiUrl>org.apache.juddi.api.impl.JUDDIApiImpl</juddiApiUrl>
- -->
- <!-- JAX-WS Transport -->
+
+ <!-- JAX-WS Transport
<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
<custodyTransferUrl>${webservice.baseurl}/juddiv3/services/custody-transfer</custodyTransferUrl>
<inquiryUrl>${webservice.baseurl}/juddiv3/services/inquiry</inquiryUrl>
@@ -31,6 +33,7 @@
<subscriptionUrl>${webservice.baseurl}/juddiv3/services/subscription</subscriptionUrl>
<subscriptionListenerUrl>${webservice.baseurl}/juddiv3/services/subscription-listener</subscriptionListenerUrl>
<juddiApiUrl>${webservice.baseurl}/juddiv3/services/juddi-api?wsdl</juddiApiUrl>
+ -->
</node>
</nodes>
<clerks registerOnStartup="true">
Modified:
trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java
===================================================================
---
trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java 2011-06-09
17:30:43 UTC (rev 1380)
+++
trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java 2011-06-10
15:39:46 UTC (rev 1381)
@@ -146,7 +146,9 @@
try {
BPEL2UDDI bpel2UDDI = new BPEL2UDDI(bpelClerk, urlLocalizer, properties);
String serviceKey = bpel2UDDI.unRegister(serviceName, portName, serviceURL);
- registration.getServiceLocator(bpelClerk.getName()).removeService(serviceKey);
+ if (registration.getServiceLocator(bpelClerk.getName())!=null) {
+ registration.getServiceLocator(bpelClerk.getName()).removeService(serviceKey);
+ }
} catch (Exception e) {
log.error("Unable to unRegister EPR for " + serviceName
+ " ." + e.getMessage(),e);