svn commit: r1804510 - in /sling/trunk/bundles/commons/scheduler/src: main/java/org/apache/sling/commons/scheduler/impl/WhiteboardHandler.java test/java/org/apache/sling/commons/scheduler/impl/WhiteboardHandlerTest.java

[cziegeler]

Author: cziegeler
Date: Wed Aug  9 12:40:56 2017
New Revision: 1804510

URL: http://svn.apache.org/viewvc?rev=1804510&view=rev
Log:
SLING-7037 : Scheduler does not retain provided name.

Modified:
    
sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/impl/WhiteboardHandler.java
    
sling/trunk/bundles/commons/scheduler/src/test/java/org/apache/sling/commons/scheduler/impl/WhiteboardHandlerTest.java

Modified: 
sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/impl/WhiteboardHandler.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/impl/WhiteboardHandler.java?rev=1804510&r1=1804509&r2=1804510&view=diff
==============================================================================
--- 
sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/impl/WhiteboardHandler.java
 (original)
+++ 
sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/impl/WhiteboardHandler.java
 Wed Aug  9 12:40:56 2017
@@ -131,9 +131,9 @@ public class WhiteboardHandler {
             } 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;
     }
 

Modified: 
sling/trunk/bundles/commons/scheduler/src/test/java/org/apache/sling/commons/scheduler/impl/WhiteboardHandlerTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/scheduler/src/test/java/org/apache/sling/commons/scheduler/impl/WhiteboardHandlerTest.java?rev=1804510&r1=1804509&r2=1804510&view=diff
==============================================================================
--- 
sling/trunk/bundles/commons/scheduler/src/test/java/org/apache/sling/commons/scheduler/impl/WhiteboardHandlerTest.java
 (original)
+++ 
sling/trunk/bundles/commons/scheduler/src/test/java/org/apache/sling/commons/scheduler/impl/WhiteboardHandlerTest.java
 Wed Aug  9 12:40:56 2017
@@ -81,7 +81,7 @@ public class WhiteboardHandlerTest {
         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 @@ public class WhiteboardHandlerTest {
         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 @@ public class WhiteboardHandlerTest {
         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));
     }