You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2009/03/27 15:21:17 UTC
svn commit: r759149 - in /tuscany/branches/sca-java-1.x:
modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java
tutorials/store/store-test/test/StoreSupplierTestCase.java
Author: slaws
Date: Fri Mar 27 14:21:16 2009
New Revision: 759149
URL: http://svn.apache.org/viewvc?rev=759149&view=rev
Log:
TUSCANY-2944 don't raise NPE if the component type model cannot be determined
Modified:
tuscany/branches/sca-java-1.x/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java
tuscany/branches/sca-java-1.x/tutorials/store/store-test/test/StoreSupplierTestCase.java
Modified: tuscany/branches/sca-java-1.x/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java?rev=759149&r1=759148&r2=759149&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java (original)
+++ tuscany/branches/sca-java-1.x/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java Fri Mar 27 14:21:16 2009
@@ -140,13 +140,21 @@
if(jeeExtension != null) {
ComponentType ct = jeeExtension.createImplementationEjbComponentType(ejbModuleInfo, ejbLink);
- implementation.getServices().addAll(ct.getServices());
+ // TODO - SL - TUSCANY-2944 - these new JEE processors are causing problems with existing contributions
+ // ct is null if there is no EJBInfo
+ if (ct != null){
+ implementation.getServices().addAll(ct.getServices());
+ }
}
if(jeeOptionalExtension != null) {
ComponentType ct = jeeOptionalExtension.createImplementationEjbComponentType(ejbModuleInfo, ejbLink);
- implementation.getReferences().addAll(ct.getReferences());
- implementation.getProperties().addAll(ct.getProperties());
+ // TODO - SL - TUSCANY-2944 - these new JEE processors are causing problems with existing contributions
+ // ct is null if there is no EJBInfo
+ if (ct != null){
+ implementation.getReferences().addAll(ct.getReferences());
+ implementation.getProperties().addAll(ct.getProperties());
+ }
}
// TODO: Introspection of bean class
Modified: tuscany/branches/sca-java-1.x/tutorials/store/store-test/test/StoreSupplierTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/tutorials/store/store-test/test/StoreSupplierTestCase.java?rev=759149&r1=759148&r2=759149&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/tutorials/store/store-test/test/StoreSupplierTestCase.java (original)
+++ tuscany/branches/sca-java-1.x/tutorials/store/store-test/test/StoreSupplierTestCase.java Fri Mar 27 14:21:16 2009
@@ -19,6 +19,8 @@
package test;
+import java.io.IOException;
+
import junit.framework.Assert;
import junit.framework.TestCase;
@@ -28,6 +30,7 @@
import org.apache.tuscany.sca.node.launcher.NodeLauncher;
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.Ignore;
@@ -76,6 +79,18 @@
domainManager.stop();
}
+/*
+ @Test
+ public void testWaitForInput() {
+ try {
+ System.out.println("press enter to continue)");
+ System.in.read();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+*/
+
@Test
public void testShop() {
SCAClient client = (SCAClient)storeClientNode;