Author: gwimmel
Date: Tue Sep 30 09:36:14 2014
New Revision: 1628381
URL: http://svn.apache.org/r1628381
Log:
[SYNCOPE-555] Merge from 1_1_X, 1_2_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/ConnectorController.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/NotificationController.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/PolicyController.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/ReportController.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/SecurityQuestionController.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/TaskController.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_2_X:r1628191-1628380
Merged /syncope/branches/1_1_X:r1625275-1628380
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/ConnectorController.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/ConnectorController.java?rev=1628381&r1=1628380&r2=1628381&view=diff
==============================================================================
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/ConnectorController.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/ConnectorController.java
Tue Sep 30 09:36:14 2014
@@ -326,7 +326,7 @@ public class ConnectorController extends
}
}
- if (id != null) {
+ if ((id != null) && !id.equals(0l)) {
try {
return binder.getConnInstanceTO(connInstanceDAO.find(id));
} catch (Throwable ignore) {
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/NotificationController.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/NotificationController.java?rev=1628381&r1=1628380&r2=1628381&view=diff
==============================================================================
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/NotificationController.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/NotificationController.java
Tue Sep 30 09:36:14 2014
@@ -113,7 +113,7 @@ public class NotificationController exte
}
}
- if (id != null) {
+ if ((id != null) && !id.equals(0l)) {
try {
return binder.getNotificationTO(notificationDAO.find(id));
} catch (Throwable ignore) {
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/PolicyController.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/PolicyController.java?rev=1628381&r1=1628380&r2=1628381&view=diff
==============================================================================
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/PolicyController.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/PolicyController.java
Tue Sep 30 09:36:14 2014
@@ -183,7 +183,7 @@ public class PolicyController extends Ab
}
}
- if (id != null) {
+ if ((id != null) && !id.equals(0l)) {
try {
return binder.getPolicyTO(policyDAO.find(id));
} catch (Throwable ignore) {
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/ReportController.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/ReportController.java?rev=1628381&r1=1628380&r2=1628381&view=diff
==============================================================================
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/ReportController.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/ReportController.java
Tue Sep 30 09:36:14 2014
@@ -330,7 +330,7 @@ public class ReportController extends Ab
}
}
- if (id != null) {
+ if ((id != null) && !id.equals(0l)) {
try {
return binder.getReportTO(reportDAO.find(id));
} catch (Throwable ignore) {
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java?rev=1628381&r1=1628380&r2=1628381&view=diff
==============================================================================
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java
Tue Sep 30 09:36:14 2014
@@ -445,7 +445,7 @@ public class RoleController extends Abst
}
}
- if (id != null) {
+ if ((id != null) && !id.equals(0l)) {
try {
return binder.getRoleTO(id);
} catch (Throwable ignore) {
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/SecurityQuestionController.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/SecurityQuestionController.java?rev=1628381&r1=1628380&r2=1628381&view=diff
==============================================================================
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/SecurityQuestionController.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/SecurityQuestionController.java
Tue Sep 30 09:36:14 2014
@@ -136,7 +136,7 @@ public class SecurityQuestionController
}
}
- if (id != null) {
+ if ((id != null) && !id.equals(0l)) {
try {
return
binder.getSecurityQuestionTO(securityQuestionDAO.find(id));
} catch (Throwable ignore) {
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=1628381&r1=1628380&r2=1628381&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
Tue Sep 30 09:36:14 2014
@@ -389,7 +389,7 @@ public class TaskController extends Abst
}
}
- if (id != null) {
+ if ((id != null) && !id.equals(0l)) {
try {
final Task task = taskDAO.find(id);
return binder.getTaskTO(task, TaskUtil.getInstance(task));
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java?rev=1628381&r1=1628380&r2=1628381&view=diff
==============================================================================
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java
Tue Sep 30 09:36:14 2014
@@ -628,7 +628,7 @@ public class UserController extends Abst
}
}
- if (id != null) {
+ if ((id != null) && !id.equals(0l)) {
try {
return id instanceof Long ? binder.getUserTO((Long) id) :
binder.getUserTO((String) id);
} catch (Throwable ignore) {
