From 1d016562117b0a4fc9ec04978f72fd6cc296265b Mon Sep 17 00:00:00 2001
From: George Gastaldi <gegastaldi@gmail.com>
Date: Tue, 19 Mar 2013 14:21:27 -0300
Subject: [PATCH] Revert "Added LockManager.performLocked with Runnable"

This reverts commit 1b9dcd816e906776d9525da159d3174bbf31f00e.
---
 .../forge/container/lock/LockManager.java     |  5 -----
 .../forge/container/LockManagerImpl.java      | 22 -------------------
 .../container/addons/AddonDependencyImpl.java |  7 ++++--
 .../container/impl/AddonRegistryImpl.java     |  6 ++---
 4 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/container-api/src/main/java/org/jboss/forge/container/lock/LockManager.java b/container-api/src/main/java/org/jboss/forge/container/lock/LockManager.java
index 522d312652..a256498d1c 100644
--- a/container-api/src/main/java/org/jboss/forge/container/lock/LockManager.java
+++ b/container-api/src/main/java/org/jboss/forge/container/lock/LockManager.java
@@ -24,9 +24,4 @@ public interface LockManager
     * the result, if any.
     */
    <T> T performLocked(LockMode mode, Callable<T> task);
-
-   /**
-    * Perform the given {@link Runnable} task after acquiring a {@link Lock} of the given {@link LockMode} type.
-    */
-   void performLocked(LockMode mode, Runnable runnable);
 }
diff --git a/container/src/main/java/org/jboss/forge/container/LockManagerImpl.java b/container/src/main/java/org/jboss/forge/container/LockManagerImpl.java
index 34414d13f0..acfb297dad 100644
--- a/container/src/main/java/org/jboss/forge/container/LockManagerImpl.java
+++ b/container/src/main/java/org/jboss/forge/container/LockManagerImpl.java
@@ -58,26 +58,4 @@ public <T> T performLocked(LockMode mode, Callable<T> task)
       return result;
    }
 
-   @Override
-   public void performLocked(LockMode mode, Runnable task)
-   {
-      Assert.notNull(mode, "LockMode must not be null.");
-      Assert.notNull(task, "Task to perform must not be null.");
-
-      Lock lock = obtainLock(mode);
-      lock.lock();
-      try
-      {
-         task.run();
-      }
-      catch (Exception e)
-      {
-         throw new ContainerException(e);
-      }
-      finally
-      {
-         lock.unlock();
-      }
-   }
-
 }
diff --git a/container/src/main/java/org/jboss/forge/container/addons/AddonDependencyImpl.java b/container/src/main/java/org/jboss/forge/container/addons/AddonDependencyImpl.java
index 996b9394e2..2a929fb991 100644
--- a/container/src/main/java/org/jboss/forge/container/addons/AddonDependencyImpl.java
+++ b/container/src/main/java/org/jboss/forge/container/addons/AddonDependencyImpl.java
@@ -6,6 +6,8 @@
  */
 package org.jboss.forge.container.addons;
 
+import java.util.concurrent.Callable;
+
 import org.jboss.forge.container.lock.LockManager;
 import org.jboss.forge.container.lock.LockMode;
 import org.jboss.forge.container.util.Assert;
@@ -57,12 +59,13 @@ public Addon getDependency()
 
    public void setDependency(final Addon dependency)
    {
-      lockManager.performLocked(LockMode.WRITE, new Runnable()
+      lockManager.performLocked(LockMode.WRITE, new Callable<Object>()
       {
          @Override
-         public void run()
+         public Object call() throws Exception
          {
             AddonDependencyImpl.this.dependency = dependency;
+            return dependency;
          }
       });
    }
diff --git a/container/src/main/java/org/jboss/forge/container/impl/AddonRegistryImpl.java b/container/src/main/java/org/jboss/forge/container/impl/AddonRegistryImpl.java
index baa835aaa2..03b6e3da2c 100644
--- a/container/src/main/java/org/jboss/forge/container/impl/AddonRegistryImpl.java
+++ b/container/src/main/java/org/jboss/forge/container/impl/AddonRegistryImpl.java
@@ -139,11 +139,10 @@ public Boolean call() throws Exception
 
    public void removeServices(final ClassLoader classLoader) throws IllegalArgumentException
    {
-      lock.performLocked(LockMode.WRITE, new Runnable()
+      lock.performLocked(LockMode.WRITE, new Callable<Void>()
       {
-
          @Override
-         public void run()
+         public Void call() throws Exception
          {
             Iterator<AddonImpl> it = addons.iterator();
             while (it.hasNext())
@@ -154,6 +153,7 @@ public void run()
                   it.remove();
                }
             }
+            return null;
          }
       });
    }