You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2015/12/28 15:25:14 UTC

svn commit: r1721926 - /sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/config/JobManagerConfiguration.java

Author: cziegeler
Date: Mon Dec 28 14:25:14 2015
New Revision: 1721926

URL: http://svn.apache.org/viewvc?rev=1721926&view=rev
Log:
Code cleanup - remove unused locks path

Modified:
    sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/config/JobManagerConfiguration.java

Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/config/JobManagerConfiguration.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/config/JobManagerConfiguration.java?rev=1721926&r1=1721925&r2=1721926&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/config/JobManagerConfiguration.java (original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/config/JobManagerConfiguration.java Mon Dec 28 14:25:14 2015
@@ -137,16 +137,10 @@ public class JobManagerConfiguration imp
     /** The base path for assigned jobs to the current instance - ending with a slash. */
     private String localJobsPathWithSlash;
 
-    /** The base path for locks. */
-    private String locksPath;
-
     private String previousVersionAnonPath;
 
     private String previousVersionIdentifiedPath;
 
-    /** The base path for locks - ending with a slash. */
-    private String locksPathWithSlash;
-
     private volatile long backgroundLoadDelay;
 
     private volatile boolean disabledDistribution;
@@ -199,8 +193,6 @@ public class JobManagerConfiguration imp
         // create initial resources
         this.assignedJobsPath = this.jobsBasePathWithSlash + "assigned";
         this.unassignedJobsPath = this.jobsBasePathWithSlash + "unassigned";
-        this.locksPath = this.jobsBasePathWithSlash + "locks";
-        this.locksPathWithSlash = this.locksPath.concat("/");
 
         this.localJobsPath = this.assignedJobsPath.concat("/").concat(Environment.APPLICATION_ID);
         this.localJobsPathWithSlash = this.localJobsPath.concat("/");
@@ -220,7 +212,6 @@ public class JobManagerConfiguration imp
         try {
             ResourceHelper.getOrCreateBasePath(resolver, this.getLocalJobsPath());
             ResourceHelper.getOrCreateBasePath(resolver, this.getUnassignedJobsPath());
-            ResourceHelper.getOrCreateBasePath(resolver, this.getLocksPath());
         } catch ( final PersistenceException pe ) {
             logger.error("Unable to create default paths: " + pe.getMessage(), pe);
             throw new RuntimeException(pe);
@@ -319,14 +310,6 @@ public class JobManagerConfiguration imp
         return this.localJobsPath;
     }
 
-    /**
-     * Get the resource path for all locks
-     * @return The path - does not end with a slash
-     */
-    public String getLocksPath() {
-        return this.locksPath;
-    }
-
     /** Counter for jobs without an id. */
     private final AtomicLong jobCounter = new AtomicLong(0);
 
@@ -389,10 +372,6 @@ public class JobManagerConfiguration imp
         return this.jobsBasePathWithSlash;
     }
 
-    public boolean isLock(final String lockPath) {
-        return lockPath.startsWith(this.locksPathWithSlash);
-    }
-
     public String getPreviousVersionAnonPath() {
         return this.previousVersionAnonPath;
     }