You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by pa...@apache.org on 2017/05/07 21:28:01 UTC
svn commit: r1794262 - in
/sling/trunk/bundles/extensions/discovery/commons/src/main/java/org/apache/sling/discovery/commons/providers:
ViewStateManager.java spi/ClusterSyncService.java
spi/base/OakBacklogClusterSyncService.java
Author: pauls
Date: Sun May 7 21:28:01 2017
New Revision: 1794262
URL: http://svn.apache.org/viewvc?rev=1794262&view=rev
Log:
Fix some javadoc.
Modified:
sling/trunk/bundles/extensions/discovery/commons/src/main/java/org/apache/sling/discovery/commons/providers/ViewStateManager.java
sling/trunk/bundles/extensions/discovery/commons/src/main/java/org/apache/sling/discovery/commons/providers/spi/ClusterSyncService.java
sling/trunk/bundles/extensions/discovery/commons/src/main/java/org/apache/sling/discovery/commons/providers/spi/base/OakBacklogClusterSyncService.java
Modified: sling/trunk/bundles/extensions/discovery/commons/src/main/java/org/apache/sling/discovery/commons/providers/ViewStateManager.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/commons/src/main/java/org/apache/sling/discovery/commons/providers/ViewStateManager.java?rev=1794262&r1=1794261&r2=1794262&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/commons/src/main/java/org/apache/sling/discovery/commons/providers/ViewStateManager.java (original)
+++ sling/trunk/bundles/extensions/discovery/commons/src/main/java/org/apache/sling/discovery/commons/providers/ViewStateManager.java Sun May 7 21:28:01 2017
@@ -83,7 +83,6 @@ public interface ViewStateManager {
* listeners (in the latter case, also sends a TOPOLOGY_CHANGING if that has not yet been
* done)
* @param newView the new, established view
- * @return false if the newView was the same as previous and we were not in 'changing' mode,
* true if we were either in changing mode or the newView was different from the previous one.
*/
void handleNewView(BaseTopologyView newView);
@@ -94,7 +93,7 @@ public interface ViewStateManager {
* <p>
* @param timeout time in millis to wait for at max - 0 to not wait at all - -1
* to wait indefinitely
- * @return 0 if no more async events exist, >0 the number of queued or in-flight (being sent)
+ * @return 0 if no more async events exist, or the number of queued or in-flight (being sent)
* events if the timeout hit early
*/
int waitForAsyncEvents(long timeout);
Modified: sling/trunk/bundles/extensions/discovery/commons/src/main/java/org/apache/sling/discovery/commons/providers/spi/ClusterSyncService.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/commons/src/main/java/org/apache/sling/discovery/commons/providers/spi/ClusterSyncService.java?rev=1794262&r1=1794261&r2=1794262&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/commons/src/main/java/org/apache/sling/discovery/commons/providers/spi/ClusterSyncService.java (original)
+++ sling/trunk/bundles/extensions/discovery/commons/src/main/java/org/apache/sling/discovery/commons/providers/spi/ClusterSyncService.java Sun May 7 21:28:01 2017
@@ -32,7 +32,7 @@ import org.apache.sling.discovery.common
* important that one listener doesn't do activity based on
* an older incarnation of the topologyView than another listener
* on another instance. they should change from one view to the
- * next view based on the same repository state.</li>
+ * next view based on the same repository state.
* </li>
* <li>when an instance leaves the cluster (eg crashes), then
* depending on the repository it might have left a backlog around
Modified: sling/trunk/bundles/extensions/discovery/commons/src/main/java/org/apache/sling/discovery/commons/providers/spi/base/OakBacklogClusterSyncService.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/commons/src/main/java/org/apache/sling/discovery/commons/providers/spi/base/OakBacklogClusterSyncService.java?rev=1794262&r1=1794261&r2=1794262&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/commons/src/main/java/org/apache/sling/discovery/commons/providers/spi/base/OakBacklogClusterSyncService.java (original)
+++ sling/trunk/bundles/extensions/discovery/commons/src/main/java/org/apache/sling/discovery/commons/providers/spi/base/OakBacklogClusterSyncService.java Sun May 7 21:28:01 2017
@@ -76,15 +76,6 @@ public class OakBacklogClusterSyncServic
/**
* for testing only!
- * @param resourceResolverFactory
- * @param slingId the local slingId
- * @param syncTokenTimeoutMillis timeout value in millis after which the
- * sync-token process is cancelled - or -1 if no timeout should be used there
- * @param backlogWaitTimeoutMillis timeout value in millis after which
- * the waiting-while-backlog should be cancelled - or -1 if no timeout should be
- * used there
- * @throws LoginException when the login for initialization failed
- * @throws JSONException when the descriptor wasn't proper json at init time
*/
public static OakBacklogClusterSyncService testConstructor(
final DiscoveryLiteConfig commonsConfig,