Make promote and demote operation not on the managed life cycle inter…

…face
gatein · Apr 2, 2013 · fcf799c · fcf799c
1 parent 289bc5f
commit fcf799c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 17 deletions.
diff --git a/portlet/src/main/java/org/gatein/pc/portlet/container/managed/ManagedObject.java b/portlet/src/main/java/org/gatein/pc/portlet/container/managed/ManagedObject.java
@@ -43,20 +43,6 @@ public interface ManagedObject
     */
    Throwable getFailure();
 
-   /**
-    * Attempt to promote the managed object.
-    *
-    * @throws IllegalStateException when reentrency is detected
-    */
-   void promote(LifeCycleStatus to) throws IllegalStateException;
-
-   /**
-    * Attempt to demote the managed object.
-    *
-    * @throws IllegalStateException when reentrency is detected
-    */
-   void demote(LifeCycleStatus to) throws IllegalStateException;
-
    /**
     * Attempt to start the managed object, same as calling <code>promote(LifeCycleStatus.STARTED)</code>.
     *

diff --git a/portlet/src/main/java/org/gatein/pc/portlet/impl/container/LifeCycle.java b/portlet/src/main/java/org/gatein/pc/portlet/impl/container/LifeCycle.java
@@ -72,8 +72,12 @@ public final void managedStart() throws IllegalStateException
       promote(LifeCycleStatus.STARTED);
    }
 
-   @Override
-   public final synchronized void promote(LifeCycleStatus to) throws IllegalStateException
+   /**
+    * Attempt to promote the managed object.
+    *
+    * @throws IllegalStateException when reentrency is detected
+    */
+   final synchronized void promote(LifeCycleStatus to) throws IllegalStateException
    {
       if (active)
       {
@@ -194,7 +198,12 @@ public final void managedDestroy()
       demote(LifeCycleStatus.INITIALIZED);
    }
 
-   public final synchronized void demote(LifeCycleStatus to) throws IllegalStateException
+   /**
+    * Attempt to demote the managed object.
+    *
+    * @throws IllegalStateException when reentrency is detected
+    */
+   final synchronized void demote(LifeCycleStatus to) throws IllegalStateException
    {
       if (active)
       {