Return-Path: X-Original-To: apmail-syncope-commits-archive@www.apache.org Delivered-To: apmail-syncope-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F3DC6DC17 for ; Thu, 3 Jan 2013 16:09:58 +0000 (UTC) Received: (qmail 2465 invoked by uid 500); 3 Jan 2013 16:09:58 -0000 Delivered-To: apmail-syncope-commits-archive@syncope.apache.org Received: (qmail 2433 invoked by uid 500); 3 Jan 2013 16:09:58 -0000 Mailing-List: contact commits-help@syncope.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@syncope.apache.org Delivered-To: mailing list commits@syncope.apache.org Received: (qmail 2423 invoked by uid 99); 3 Jan 2013 16:09:58 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Jan 2013 16:09:58 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Jan 2013 16:09:58 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4E91E23889C5; Thu, 3 Jan 2013 16:09:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1428429 - /syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/rest/PolicyRestClient.java Date: Thu, 03 Jan 2013 16:09:38 -0000 To: commits@syncope.apache.org From: fmartelli@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130103160938.4E91E23889C5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fmartelli Date: Thu Jan 3 16:09:37 2013 New Revision: 1428429 URL: http://svn.apache.org/viewvc?rev=1428429&view=rev Log: removed global policy as required by SYNCOPE-255 Modified: syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/rest/PolicyRestClient.java Modified: syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/rest/PolicyRestClient.java URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/rest/PolicyRestClient.java?rev=1428429&r1=1428428&r2=1428429&view=diff ============================================================================== --- syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/rest/PolicyRestClient.java (original) +++ syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/rest/PolicyRestClient.java Thu Jan 3 16:09:37 2013 @@ -122,19 +122,6 @@ public class PolicyRestClient extends Ab res.addAll(Arrays.asList(policies)); } - PolicyTO globalPolicy = null; - - try { - globalPolicy = (T) SyncopeSession.get().getRestTemplate().getForObject( - baseURL + "policy/" + policy + "/global/read", globalReference); - } catch (Exception ignore) { - LOG.warn("No global policy found", ignore); - } - - if (globalPolicy != null) { - res.add(0, (T) globalPolicy); - } - } catch (Exception ignore) { LOG.error("No policy found", ignore); }