You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by gw...@apache.org on 2014/09/30 10:39:38 UTC
svn commit: r1628373 -
/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/
Author: gwimmel
Date: Tue Sep 30 08:39:38 2014
New Revision: 1628373
URL: http://svn.apache.org/r1628373
Log:
[SYNCOPE-555] check for id != 0 in *Controller.resolveReference()
Modified:
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/ConnInstanceController.java
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/NotificationController.java
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/PolicyController.java
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/ReportController.java
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/TaskController.java
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/UserRequestController.java
Modified: syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/ConnInstanceController.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/ConnInstanceController.java?rev=1628373&r1=1628372&r2=1628373&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/ConnInstanceController.java (original)
+++ syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/ConnInstanceController.java Tue Sep 30 08:39:38 2014
@@ -366,7 +366,7 @@ public class ConnInstanceController exte
}
}
- if (id != null) {
+ if ((id != null) && !id.equals(0l)) {
try {
return binder.getConnInstanceTO(connInstanceDAO.find(id));
} catch (Throwable ignore) {
Modified: syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/NotificationController.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/NotificationController.java?rev=1628373&r1=1628372&r2=1628373&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/NotificationController.java (original)
+++ syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/NotificationController.java Tue Sep 30 08:39:38 2014
@@ -134,7 +134,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/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/PolicyController.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/PolicyController.java?rev=1628373&r1=1628372&r2=1628373&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/PolicyController.java (original)
+++ syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/PolicyController.java Tue Sep 30 08:39:38 2014
@@ -215,7 +215,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/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/ReportController.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/ReportController.java?rev=1628373&r1=1628372&r2=1628373&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/ReportController.java (original)
+++ syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/ReportController.java Tue Sep 30 08:39:38 2014
@@ -409,7 +409,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/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java?rev=1628373&r1=1628372&r2=1628373&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java (original)
+++ syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java Tue Sep 30 08:39:38 2014
@@ -365,7 +365,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/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/TaskController.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/TaskController.java?rev=1628373&r1=1628372&r2=1628373&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/TaskController.java (original)
+++ syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/TaskController.java Tue Sep 30 08:39:38 2014
@@ -444,7 +444,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, getTaskUtil(task));
Modified: syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java?rev=1628373&r1=1628372&r2=1628373&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java (original)
+++ syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java Tue Sep 30 08:39:38 2014
@@ -710,7 +710,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) {
Modified: syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/UserRequestController.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/UserRequestController.java?rev=1628373&r1=1628372&r2=1628373&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/UserRequestController.java (original)
+++ syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/UserRequestController.java Tue Sep 30 08:39:38 2014
@@ -156,7 +156,7 @@ public class UserRequestController exten
protected UserRequestTO resolveReference(final Method method, final Object... obj) {
final UserRequestTO result;
- if (ArrayUtils.isNotEmpty(obj) && obj[0] instanceof Long
+ if (ArrayUtils.isNotEmpty(obj) && obj[0] instanceof Long && !obj[0].equals(0l)
&& ("deleteRequest".equals(method.getName()) || "read".equals(method.getName()))) {
UserRequest request = userRequestDAO.find((Long) obj[0]);