You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2013/03/14 14:05:17 UTC
svn commit: r1456412 - in
/syncope/trunk/core/src/main/java/org/apache/syncope/core:
persistence/dao/impl/AbstractAttributableDAOImpl.java
rest/controller/TaskController.java
Author: ilgrosso
Date: Thu Mar 14 13:05:17 2013
New Revision: 1456412
URL: http://svn.apache.org/r1456412
Log:
Whit noise: formatting
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/AbstractAttributableDAOImpl.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/TaskController.java
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/AbstractAttributableDAOImpl.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/AbstractAttributableDAOImpl.java?rev=1456412&r1=1456411&r2=1456412&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/AbstractAttributableDAOImpl.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/AbstractAttributableDAOImpl.java Thu Mar 14 13:05:17 2013
@@ -219,11 +219,12 @@ public abstract class AbstractAttributab
: attrUtil.attrValueClass().getName();
TypedQuery<AbstractAttrValue> query = entityManager.createQuery("SELECT e FROM " + entityName + " e"
- + " WHERE e.attribute.schema.name = :schemaName " + " AND (e.stringValue IS NOT NULL"
- + " AND e.stringValue = :stringValue)" + " OR (e.booleanValue IS NOT NULL"
- + " AND e.booleanValue = :booleanValue)" + " OR (e.dateValue IS NOT NULL"
- + " AND e.dateValue = :dateValue)" + " OR (e.longValue IS NOT NULL" + " AND e.longValue = :longValue)"
- + " OR (e.doubleValue IS NOT NULL" + " AND e.doubleValue = :doubleValue)",
+ + " WHERE e.attribute.schema.name = :schemaName AND (e.stringValue IS NOT NULL"
+ + " AND e.stringValue = :stringValue)"
+ + " OR (e.booleanValue IS NOT NULL AND e.booleanValue = :booleanValue)"
+ + " OR (e.dateValue IS NOT NULL AND e.dateValue = :dateValue)"
+ + " OR (e.longValue IS NOT NULL AND e.longValue = :longValue)"
+ + " OR (e.doubleValue IS NOT NULL AND e.doubleValue = :doubleValue)",
AbstractAttrValue.class);
query.setParameter("schemaName", schemaName);
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/TaskController.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/TaskController.java?rev=1456412&r1=1456411&r2=1456412&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/TaskController.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/TaskController.java Thu Mar 14 13:05:17 2013
@@ -305,11 +305,13 @@ public class TaskController extends Abst
case SCHED:
case SYNC:
try {
- jobInstanceLoader.registerJob(task, ((SchedTask) task).getJobClassName(), ((SchedTask) task).
- getCronExpression());
+ jobInstanceLoader.registerJob(task,
+ ((SchedTask) task).getJobClassName(),
+ ((SchedTask) task).getCronExpression());
JobDataMap map = new JobDataMap();
map.put(AbstractTaskJob.DRY_RUN_JOBDETAIL_KEY, dryRun);
+
scheduler.getScheduler().triggerJob(
new JobKey(JobInstanceLoader.getJobName(task), Scheduler.DEFAULT_GROUP), map);
} catch (Exception e) {