Author: jsdelfino
Date: Mon Sep 17 03:24:15 2007
New Revision: 576348
URL: http://svn.apache.org/viewvc?rev=576348&view=rev
Log:
Fix for TUSCANY-1722, NPE in JSON webapp samples. Initialize default URI of
bindings on top level composite services.
Modified:
incubator/tuscany/branches/sca-java-1.0/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java
incubator/tuscany/branches/sca-java-1.0/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
Modified:
incubator/tuscany/branches/sca-java-1.0/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java?rev=576348&r1=576347&r2=576348&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.0/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java
(original)
+++
incubator/tuscany/branches/sca-java-1.0/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java
Mon Sep 17 03:24:15 2007
@@ -133,7 +133,11 @@
} else {
// If there's only one service then binding URI
defaults
// to the parent URI
- bindingURI = parentURI;
+ if (parentURI != null) {
+ bindingURI = parentURI;
+ } else {
+ bindingURI = String.valueOf(binding.getName());
+ }
}
} else {
// Combine the specified binding URI with the component URI
Modified:
incubator/tuscany/branches/sca-java-1.0/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java?rev=576348&r1=576347&r2=576348&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.0/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
(original)
+++
incubator/tuscany/branches/sca-java-1.0/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
Mon Sep 17 03:24:15 2007
@@ -214,9 +214,11 @@
// if the wsa:EndpointReference has an address element with an
absolute URI use that
if (eprURI != null && eprURI.isAbsolute()) {
- if (wsBinding.getURI() != null) {
- throw new IllegalArgumentException("Cannot specify binding URI
when wsa:EndpointReference has aboslute address URI");
- }
+ //FIXME Throwing an exception breaks as wsBinding.getURI() will
return the default URI
+ // derived from the service name or the URI actually configured in
the .composite
+// if (wsBinding.getURI() != null) {
+// throw new IllegalArgumentException("Cannot specify binding
URI when wsa:EndpointReference has aboslute address URI");
+// }
return URI.create(eprURI.toString());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
