You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2019/01/06 17:48:05 UTC

[aries-journaled-events] branch master updated: ARIES-1881 - Fix OSGi config

This is an automated email from the ASF dual-hosted git repository.

cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-journaled-events.git


The following commit(s) were added to refs/heads/master by this push:
     new feb25a9  ARIES-1881 - Fix OSGi config
feb25a9 is described below

commit feb25a9412f6d04b93c373ac0a95d2f021981c3b
Author: Christian Schneider <cs...@adobe.com>
AuthorDate: Sun Jan 6 18:47:46 2019 +0100

    ARIES-1881 - Fix OSGi config
---
 .../java/org/apache/aries/events/mongo/MongoEndpoint.java    |  3 +--
 .../java/org/apache/aries/events/mongo/MongoMessaging.java   | 12 ++++--------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/org.apache.aries.events.mongo/src/main/java/org/apache/aries/events/mongo/MongoEndpoint.java b/org.apache.aries.events.mongo/src/main/java/org/apache/aries/events/mongo/MongoEndpoint.java
index 7ee2a13..4be126d 100644
--- a/org.apache.aries.events.mongo/src/main/java/org/apache/aries/events/mongo/MongoEndpoint.java
+++ b/org.apache.aries.events.mongo/src/main/java/org/apache/aries/events/mongo/MongoEndpoint.java
@@ -21,9 +21,8 @@ package org.apache.aries.events.mongo;
 import org.osgi.service.metatype.annotations.AttributeDefinition;
 import org.osgi.service.metatype.annotations.ObjectClassDefinition;
 
-/** Mongo endpoint configuration. (not used yet) */
 @ObjectClassDefinition(
-        name        = "Adobe Granite Mongo Distribution - MongoDB endpoint",
+        name        = "MongoDB configuration",
         description = "Mongodb URI"
 )
 public @interface MongoEndpoint {
diff --git a/org.apache.aries.events.mongo/src/main/java/org/apache/aries/events/mongo/MongoMessaging.java b/org.apache.aries.events.mongo/src/main/java/org/apache/aries/events/mongo/MongoMessaging.java
index 96bca0c..cde821e 100644
--- a/org.apache.aries.events.mongo/src/main/java/org/apache/aries/events/mongo/MongoMessaging.java
+++ b/org.apache.aries.events.mongo/src/main/java/org/apache/aries/events/mongo/MongoMessaging.java
@@ -73,10 +73,10 @@ public class MongoMessaging implements Messaging {
     // Private
     // *******************************************************
 
-    private CachingFactory<String, MessageSender> senderFactory = initializedInActivate();
-    private MongoEndpoint config = initializedInActivate();
-    private MongoClient client = initializedInActivate();
-    private MongoDatabase database = initializedInActivate();
+    private CachingFactory<String, MessageSender> senderFactory;
+    private MongoEndpoint config;
+    private MongoClient client;
+    private MongoDatabase database;
 
     @Activate
     protected void activate(MongoEndpoint config) {
@@ -96,8 +96,4 @@ public class MongoMessaging implements Messaging {
         client.close();
     }
 
-    private static <T> T initializedInActivate() {
-        return null;
-    }
-
 }