You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by bp...@apache.org on 2014/10/19 17:59:16 UTC
svn commit: r1632950 - in /celix/trunk: examples/hello_world/private/src/
examples/hello_world_test/private/src/
examples/osgi-in-action/chapter04-correct-lookup/private/src/
framework/private/src/ log_service/private/src/
Author: bpetri
Date: Sun Oct 19 15:59:15 2014
New Revision: 1632950
URL: http://svn.apache.org/r1632950
Log:
minor fixes
Modified:
celix/trunk/examples/hello_world/private/src/activator.c
celix/trunk/examples/hello_world_test/private/src/activator.c
celix/trunk/examples/osgi-in-action/chapter04-correct-lookup/private/src/activator.c
celix/trunk/framework/private/src/service_registration.c
celix/trunk/log_service/private/src/log_factory.c
Modified: celix/trunk/examples/hello_world/private/src/activator.c
URL: http://svn.apache.org/viewvc/celix/trunk/examples/hello_world/private/src/activator.c?rev=1632950&r1=1632949&r2=1632950&view=diff
==============================================================================
--- celix/trunk/examples/hello_world/private/src/activator.c (original)
+++ celix/trunk/examples/hello_world/private/src/activator.c Sun Oct 19 15:59:15 2014
@@ -44,7 +44,7 @@ celix_status_t bundleActivator_create(bu
} else {
status = CELIX_START_ERROR;
}
- return CELIX_SUCCESS;
+ return status;
}
celix_status_t bundleActivator_start(void * userData, bundle_context_pt context) {
Modified: celix/trunk/examples/hello_world_test/private/src/activator.c
URL: http://svn.apache.org/viewvc/celix/trunk/examples/hello_world_test/private/src/activator.c?rev=1632950&r1=1632949&r2=1632950&view=diff
==============================================================================
--- celix/trunk/examples/hello_world_test/private/src/activator.c (original)
+++ celix/trunk/examples/hello_world_test/private/src/activator.c Sun Oct 19 15:59:15 2014
@@ -44,7 +44,7 @@ celix_status_t bundleActivator_create(bu
} else {
status = CELIX_START_ERROR;
}
- return CELIX_SUCCESS;
+ return status;
}
celix_status_t bundleActivator_start(void * userData, bundle_context_pt context) {
Modified: celix/trunk/examples/osgi-in-action/chapter04-correct-lookup/private/src/activator.c
URL: http://svn.apache.org/viewvc/celix/trunk/examples/osgi-in-action/chapter04-correct-lookup/private/src/activator.c?rev=1632950&r1=1632949&r2=1632950&view=diff
==============================================================================
--- celix/trunk/examples/osgi-in-action/chapter04-correct-lookup/private/src/activator.c (original)
+++ celix/trunk/examples/osgi-in-action/chapter04-correct-lookup/private/src/activator.c Sun Oct 19 15:59:15 2014
@@ -124,11 +124,10 @@ void *APR_THREAD_FUNC LogServiceTest(apr
void startTestThread(thread_data_pt data) {
apr_pool_t *pool;
- int rc;
// start separate worker thread to run the actual tests, managed by the bundle lifecycle
bundleContext_getMemoryPool(data->m_context, &pool);
data->threadId++;
- rc = apr_thread_create(&m_logTestThread, NULL, LogServiceTest, data, pool);
+ apr_thread_create(&m_logTestThread, NULL, LogServiceTest, data, pool);
}
void stopTestThread() {
Modified: celix/trunk/framework/private/src/service_registration.c
URL: http://svn.apache.org/viewvc/celix/trunk/framework/private/src/service_registration.c?rev=1632950&r1=1632949&r2=1632950&view=diff
==============================================================================
--- celix/trunk/framework/private/src/service_registration.c (original)
+++ celix/trunk/framework/private/src/service_registration.c Sun Oct 19 15:59:15 2014
@@ -80,7 +80,7 @@ celix_status_t serviceRegistration_creat
status = CELIX_ENOMEM;
}
- return CELIX_SUCCESS;
+ return status;
}
celix_status_t serviceRegistration_destroy(service_registration_pt registration) {
Modified: celix/trunk/log_service/private/src/log_factory.c
URL: http://svn.apache.org/viewvc/celix/trunk/log_service/private/src/log_factory.c?rev=1632950&r1=1632949&r2=1632950&view=diff
==============================================================================
--- celix/trunk/log_service/private/src/log_factory.c (original)
+++ celix/trunk/log_service/private/src/log_factory.c Sun Oct 19 15:59:15 2014
@@ -55,7 +55,7 @@ celix_status_t logFactory_create(apr_poo
}
}
- return CELIX_SUCCESS;
+ return status;
}
celix_status_t logFactory_getService(void *factory, bundle_pt bundle, service_registration_pt registration, void **service) {