|
|
@ -298,11 +298,11 @@ public class ActivityProviderServiceImpl implements ActivityInfoProviderService
|
|
|
|
}
|
|
|
|
}
|
|
|
|
activityList.setList(activities);
|
|
|
|
activityList.setList(activities);
|
|
|
|
activityList.setCount(count);
|
|
|
|
activityList.setCount(count);
|
|
|
|
if (activities == null || activities.size() == 0) {
|
|
|
|
// if (activities == null || activities.size() == 0) {
|
|
|
|
if (isIfModifiedSinceSet) {
|
|
|
|
// if (isIfModifiedSinceSet) {
|
|
|
|
return Response.notModified().build();
|
|
|
|
// return Response.notModified().build();
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
return Response.ok().entity(activityList).build();
|
|
|
|
return Response.ok().entity(activityList).build();
|
|
|
|
} catch (OperationManagementException e) {
|
|
|
|
} catch (OperationManagementException e) {
|
|
|
|
String msg
|
|
|
|
String msg
|
|
|
|