commit 64b754c158d3b9cc8a00c0cc004a342ea60794fc
author Carsten Ziegeler <cziegeler@apache.org> Wed Aug 09 12:40:56 2017 +0000
committer Carsten Ziegeler <cziegeler@apache.org> Wed Aug 09 12:40:56 2017 +0000
tree 7b521b4b4b163197ae2ceee900cac9a49e48a95c
parent f7eed194e111dca252d6e78e76381728da78cedf

SLING-7037 : Scheduler does not retain provided name.

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1804510 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/sling/commons/scheduler/impl/WhiteboardHandler.java

diff --git a/src/main/java/org/apache/sling/commons/scheduler/impl/WhiteboardHandler.java b/src/main/java/org/apache/sling/commons/scheduler/impl/WhiteboardHandler.java
index 4d7c5bb..52c6948 100644
--- a/src/main/java/org/apache/sling/commons/scheduler/impl/WhiteboardHandler.java
+++ b/src/main/java/org/apache/sling/commons/scheduler/impl/WhiteboardHandler.java
@@ -131,9 +131,9 @@
             } else {
                 name = "Registered Service";
             }
+            // now append service id to create a unique identifier
+            name = name + "." + getLongProperty(ref, Constants.SERVICE_ID);
         }
-        // now append service id to create a unique identifier
-        name = name + "." + getLongProperty(ref, Constants.SERVICE_ID);
         return name;
     }
 

src/test/java/org/apache/sling/commons/scheduler/impl/WhiteboardHandlerTest.java

diff --git a/src/test/java/org/apache/sling/commons/scheduler/impl/WhiteboardHandlerTest.java b/src/test/java/org/apache/sling/commons/scheduler/impl/WhiteboardHandlerTest.java
index 742a73e..7bb674c 100644
--- a/src/test/java/org/apache/sling/commons/scheduler/impl/WhiteboardHandlerTest.java
+++ b/src/test/java/org/apache/sling/commons/scheduler/impl/WhiteboardHandlerTest.java
@@ -81,7 +81,7 @@
         final ServiceRegistration<?> reg = context.registerService(Runnable.class.getName(), service, serviceProps);
         final ServiceReference<?> reference = reg.getReference();
         handler.register(reference, service);
-        JobKey jobKey = JobKey.jobKey(schedulerName + "." + reference.getProperty(Constants.SERVICE_ID));
+        JobKey jobKey = JobKey.jobKey(schedulerName);
 
         assertNotNull(quartzScheduler.getSchedulers().get("testName").getScheduler().getJobDetail(jobKey));
     }
@@ -109,7 +109,7 @@
         final ServiceRegistration<?> reg = context.registerService(Runnable.class.getName(), service, serviceProps);
         ServiceReference<?> reference = reg.getReference();
         handler.register(reference, service);
-        JobKey jobKey = JobKey.jobKey(schedulerName + "." + reference.getProperty(Constants.SERVICE_ID));
+        JobKey jobKey = JobKey.jobKey(schedulerName);
 
         assertNotNull(quartzScheduler.getSchedulers().get("testName").getScheduler().getJobDetail(jobKey));
 
@@ -138,12 +138,12 @@
         final ServiceRegistration<?> reg = context.registerService(Runnable.class.getName(), service, serviceProps);
         final ServiceReference<?> reference = reg.getReference();
         handler.register(reference, service);
-        JobKey jobKey = JobKey.jobKey(schedulerName + "." + reference.getProperty(Constants.SERVICE_ID));
+        JobKey jobKey = JobKey.jobKey(schedulerName);
 
         JobDetail jobDetail = quartzScheduler.getSchedulers().get("testName").getScheduler().getJobDetail(jobKey);
         assertNotNull(jobDetail);
         assertEquals(schedulerName, jobDetail.getJobDataMap().getString(QuartzScheduler.DATA_MAP_PROVIDED_NAME));
-        assertEquals(schedulerName + "." + reference.getProperty(Constants.SERVICE_ID),
+        assertEquals(schedulerName,
                 jobDetail.getJobDataMap().getString(QuartzScheduler.DATA_MAP_NAME));
     }