felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clem...@apache.org
Subject svn commit: r638011 - in /felix/sandbox/clement/ipojo/tests/tests.core/src/main/java/org/apache/felix/ipojo/test/scenarios: component/CheckServiceProvider.java dependency/SimpleDependencies.java
Date Mon, 17 Mar 2008 18:32:41 GMT
Author: clement
Date: Mon Mar 17 11:32:39 2008
New Revision: 638011

URL: http://svn.apache.org/viewvc?rev=638011&view=rev
Log:
Modify "double service providing" test case.

Modified:
    felix/sandbox/clement/ipojo/tests/tests.core/src/main/java/org/apache/felix/ipojo/test/scenarios/component/CheckServiceProvider.java
    felix/sandbox/clement/ipojo/tests/tests.core/src/main/java/org/apache/felix/ipojo/test/scenarios/dependency/SimpleDependencies.java

Modified: felix/sandbox/clement/ipojo/tests/tests.core/src/main/java/org/apache/felix/ipojo/test/scenarios/component/CheckServiceProvider.java
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/tests/tests.core/src/main/java/org/apache/felix/ipojo/test/scenarios/component/CheckServiceProvider.java?rev=638011&r1=638010&r2=638011&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/tests/tests.core/src/main/java/org/apache/felix/ipojo/test/scenarios/component/CheckServiceProvider.java
(original)
+++ felix/sandbox/clement/ipojo/tests/tests.core/src/main/java/org/apache/felix/ipojo/test/scenarios/component/CheckServiceProvider.java
Mon Mar 17 11:32:39 2008
@@ -47,6 +47,7 @@
 	protected void objectBind(FooService o) {
 	    if (o == null) {
 	        System.err.println("Bind receive null !!! ");
+	        return;
 	    }
 		if(o != null && o instanceof FooService) { objectB++; }
 	}

Modified: felix/sandbox/clement/ipojo/tests/tests.core/src/main/java/org/apache/felix/ipojo/test/scenarios/dependency/SimpleDependencies.java
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/tests/tests.core/src/main/java/org/apache/felix/ipojo/test/scenarios/dependency/SimpleDependencies.java?rev=638011&r1=638010&r2=638011&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/tests/tests.core/src/main/java/org/apache/felix/ipojo/test/scenarios/dependency/SimpleDependencies.java
(original)
+++ felix/sandbox/clement/ipojo/tests/tests.core/src/main/java/org/apache/felix/ipojo/test/scenarios/dependency/SimpleDependencies.java
Mon Mar 17 11:32:39 2008
@@ -273,6 +273,7 @@
         ServiceReference cs_ref = Utils.getServiceReferenceByName(context, CheckService.class.getName(),
instance6.getInstanceName());
         assertNotNull("Check CheckService availability", cs_ref);
         CheckService cs = (CheckService) context.getService(cs_ref);
+        assertNotNull("Check cs", cs);
         cs.check();
         Properties props = cs.getProps();
         //Check properties



Mime
View raw message