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/09/17 07:49:51 UTC

[aries-component-dsl] 03/05: [ARIES-1930] This should not be execute now

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

csierra pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-component-dsl.git

commit 5bd2383687e38c92973a4e45346c9e3d75c7178f
Author: Carlos Sierra <ca...@liferay.com>
AuthorDate: Mon Sep 16 17:25:49 2019 +0200

    [ARIES-1930] This should not be execute now
    
    because the counter part has not executed
---
 .../src/main/java/org/apache/aries/component/dsl/OSGi.java         | 7 -------
 .../java/org/apache/aries/component/dsl/internal/EffectsOSGi.java  | 7 -------
 2 files changed, 14 deletions(-)

diff --git a/component-dsl/src/main/java/org/apache/aries/component/dsl/OSGi.java b/component-dsl/src/main/java/org/apache/aries/component/dsl/OSGi.java
index 7448ad4..e87ec5b 100644
--- a/component-dsl/src/main/java/org/apache/aries/component/dsl/OSGi.java
+++ b/component-dsl/src/main/java/org/apache/aries/component/dsl/OSGi.java
@@ -657,13 +657,6 @@ public interface OSGi<T> extends OSGiRunnable<T> {
 					}
 					catch (Exception e) {
 						try {
-							onRemovedBefore.accept(t);
-						}
-						catch (Exception e1) {
-							//TODO: logging
-						}
-
-						try {
 							onRemovedAfter.accept(t);
 						}
 						catch (Exception e1) {
diff --git a/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/EffectsOSGi.java b/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/EffectsOSGi.java
index ec95355..1d4d459 100644
--- a/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/EffectsOSGi.java
+++ b/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/EffectsOSGi.java
@@ -70,13 +70,6 @@ public class EffectsOSGi extends OSGiImpl<Void> {
             }
             catch (Exception e) {
                 try {
-                    onRemovingBefore.run();
-                }
-                catch (Exception e1) {
-                    //TODO: logging
-                }
-
-                try {
                     onRemovingAfter.run();
                 }
                 catch (Exception e1) {