Repository: tomee Updated Branches: refs/heads/tomee-1.7.x 3138570d0 -> 43dd894b0
http://git-wip-us.apache.org/repos/asf/tomee/blob/05855aa3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java ---------------------------------------------------------------------- diff --git a/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java b/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java index c3a8291..426eeb5 100644 --- a/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java +++ b/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java @@ -87,14 +87,19 @@ class JndiRequestHandler extends RequestHandler { private Context clientJndiTree; private final Context deploymentsJndiTree; - private Context globalJndiTree; + private final Context globalJndiTree; private final ClusterableRequestHandler clusterableRequestHandler; - private Context rootContext; + private final Context rootContext; JndiRequestHandler(final EjbDaemon daemon) throws Exception { super(daemon); final ContainerSystem containerSystem = SystemInstance.get().getComponent(ContainerSystem.class); + + if(null == containerSystem){ + throw new IllegalStateException("ContainerSystem has not been initialized"); + } + ejbJndiTree = (Context) containerSystem.getJNDIContext().lookup("openejb/remote"); deploymentsJndiTree = (Context) containerSystem.getJNDIContext().lookup("openejb/Deployment"); @@ -352,7 +357,7 @@ class JndiRequestHandler extends RequestHandler { if (serviceRef.getWsdlURL() != null) { serviceMetaData.setWsdlUrl(serviceRef.getWsdlURL().toExternalForm()); } - if (portAddresses.size() == 1) { + if (null != portAddresses && portAddresses.size() == 1) { final PortAddress portAddress = portAddresses.iterator().next(); serviceMetaData.setWsdlUrl(portAddress.getAddress() + "?wsdl"); } @@ -399,18 +404,20 @@ class JndiRequestHandler extends RequestHandler { } // add PortRefMetaData for any portAddress not added above - for (final PortAddress portAddress : portAddresses) { - PortRefMetaData portRefMetaData = portsByQName.get(portAddress.getPortQName()); - if (portRefMetaData == null) { - portRefMetaData = new PortRefMetaData(); - portRefMetaData.setQName(portAddress.getPortQName()); - portRefMetaData.setServiceEndpointInterface(portAddress.getServiceEndpointInterface()); - portRefMetaData.getAddresses().add(portAddress.getAddress()); - serviceMetaData.getPortRefs().add(portRefMetaData); - } else { - portRefMetaData.getAddresses().add(portAddress.getAddress()); - if (portRefMetaData.getServiceEndpointInterface() == null) { + if (portAddresses != null) { + for (final PortAddress portAddress : portAddresses) { + PortRefMetaData portRefMetaData = portsByQName.get(portAddress.getPortQName()); + if (portRefMetaData == null) { + portRefMetaData = new PortRefMetaData(); + portRefMetaData.setQName(portAddress.getPortQName()); portRefMetaData.setServiceEndpointInterface(portAddress.getServiceEndpointInterface()); + portRefMetaData.getAddresses().add(portAddress.getAddress()); + serviceMetaData.getPortRefs().add(portRefMetaData); + } else { + portRefMetaData.getAddresses().add(portAddress.getAddress()); + if (portRefMetaData.getServiceEndpointInterface() == null) { + portRefMetaData.setServiceEndpointInterface(portAddress.getServiceEndpointInterface()); + } } } } http://git-wip-us.apache.org/repos/asf/tomee/blob/05855aa3/tomee/tomee-juli/pom.xml ---------------------------------------------------------------------- diff --git a/tomee/tomee-juli/pom.xml b/tomee/tomee-juli/pom.xml index 9550a1c..8a0946e 100644 --- a/tomee/tomee-juli/pom.xml +++ b/tomee/tomee-juli/pom.xml @@ -16,7 +16,8 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <parent> <artifactId>tomee</artifactId>
