svn commit: r1025763 - in /felix/trunk/coordinator/src/main/java/org/apache/felix: coordination/impl/CoordinatorImpl.java service/coordination/Coordinator.java

[fm...@apache.org]

Author: fmeschbe
Date: Wed Oct 20 21:20:49 2010
New Revision: 1025763

URL: http://svn.apache.org/viewvc?rev=1025763&view=rev
Log:
FELIX-2671 (OSGi Bug 105) Remove participateOrBegin method

Modified:
    felix/trunk/coordinator/src/main/java/org/apache/felix/coordination/impl/CoordinatorImpl.java
    felix/trunk/coordinator/src/main/java/org/apache/felix/service/coordination/Coordinator.java

Modified: felix/trunk/coordinator/src/main/java/org/apache/felix/coordination/impl/CoordinatorImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/coordinator/src/main/java/org/apache/felix/coordination/impl/CoordinatorImpl.java?rev=1025763&r1=1025762&r2=1025763&view=diff
==============================================================================
--- felix/trunk/coordinator/src/main/java/org/apache/felix/coordination/impl/CoordinatorImpl.java (original)
+++ felix/trunk/coordinator/src/main/java/org/apache/felix/coordination/impl/CoordinatorImpl.java Wed Oct 20 21:20:49 2010
@@ -78,9 +78,4 @@ public class CoordinatorImpl implements 
         return mgr.participate(participant);
     }
 
-    public Coordination participateOrBegin(Participant ifActive) {
-        // TODO: check permission
-        return mgr.participateOrBegin(ifActive);
-    }
-
 }

Modified: felix/trunk/coordinator/src/main/java/org/apache/felix/service/coordination/Coordinator.java
URL: http://svn.apache.org/viewvc/felix/trunk/coordinator/src/main/java/org/apache/felix/service/coordination/Coordinator.java?rev=1025763&r1=1025762&r2=1025763&view=diff
==============================================================================
--- felix/trunk/coordinator/src/main/java/org/apache/felix/service/coordination/Coordinator.java (original)
+++ felix/trunk/coordinator/src/main/java/org/apache/felix/service/coordination/Coordinator.java Wed Oct 20 21:20:49 2010
@@ -149,26 +149,6 @@ public interface Coordinator {
     boolean participate(Participant participant) throws CoordinationException;
 
     /**
-     * Participate if there is an active Coordination otherwise initiate a new
-     * Coordination. This method is a short cut that atomically checks if there
-     * is a current Coordination. It either returns a new current Coordination
-     * object if no current Coordination exists or it adds the participant to
-     * the current Coordination. Notice that this method can block until the
-     * participant is free to participate on the current or new Coordination.
-     * This method makes it simple to start a new Coordination or to participate
-     * in an existing Coordination. See begin(String) and
-     * participate(Participant) for the details of those methods.
-     *
-     * @param ifActive The participant
-     * @return null if there is a current Coordination otherwise a newly
-     *         initiated Coordination.
-     * @throws SecurityException This method requires the action for the current
-     *             Coordination, if any. Otherwise it requires to create a new
-     *             coordination.
-     */
-    Coordination participateOrBegin(Participant ifActive);
-
-    /**
      * Always fail the current Coordination, if exists. Must fail the current
      * Coordination and return true or return false if there is no current
      * Coordination.