svn commit: r1728542 - /aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/UninstallAction.java

[jwross]

Author: jwross
Date: Thu Feb  4 19:26:33 2016
New Revision: 1728542

URL: http://svn.apache.org/viewvc?rev=1728542&view=rev
Log:
[ARIES-1383] Provide option to disable the provisioning of dependencies at 
install time.

Use the correct state when flagging an uninstall for re-entry protection.

Modified:
    
aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/UninstallAction.java

Modified: 
aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/UninstallAction.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/UninstallAction.java?rev=1728542&r1=1728541&r2=1728542&view=diff
==============================================================================
--- 
aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/UninstallAction.java
 (original)
+++ 
aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/UninstallAction.java
 Thu Feb  4 19:26:33 2016
@@ -25,7 +25,7 @@ public class UninstallAction extends Abs
        @Override
        public Object run() {
                // Protect against re-entry now that cycles are supported.
-               if (!LockingStrategy.set(State.STOPPING, target)) {
+               if (!LockingStrategy.set(State.UNINSTALLING, target)) {
                        return null;
                }
                try {
@@ -51,7 +51,7 @@ public class UninstallAction extends Abs
                }
                finally {
                        // Protection against re-entry no longer required.
-                       LockingStrategy.unset(State.STOPPING, target);
+                       LockingStrategy.unset(State.UNINSTALLING, target);
                }
                return null;
        }