Return-Path: X-Original-To: apmail-incubator-ace-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ace-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 62BC478F4 for ; Fri, 5 Aug 2011 11:47:18 +0000 (UTC) Received: (qmail 99976 invoked by uid 500); 5 Aug 2011 11:47:18 -0000 Delivered-To: apmail-incubator-ace-commits-archive@incubator.apache.org Received: (qmail 99945 invoked by uid 500); 5 Aug 2011 11:47:17 -0000 Mailing-List: contact ace-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ace-dev@incubator.apache.org Delivered-To: mailing list ace-commits@incubator.apache.org Received: (qmail 99936 invoked by uid 99); 5 Aug 2011 11:47:16 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Aug 2011 11:47:16 +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; Fri, 05 Aug 2011 11:47:15 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 621F9238888F; Fri, 5 Aug 2011 11:46:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1154177 - in /incubator/ace/trunk/ace-client-rest/src/main/java/org/apache/ace/client/rest: RESTClientServlet.java Workspace.java Date: Fri, 05 Aug 2011 11:46:55 -0000 To: ace-commits@incubator.apache.org From: marrs@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110805114655.621F9238888F@eris.apache.org> Author: marrs Date: Fri Aug 5 11:46:54 2011 New Revision: 1154177 URL: http://svn.apache.org/viewvc?rev=1154177&view=rev Log: ACE-164 Caught the special condition that occurred. If a target is not registered, it will for now simply not show up in the list. As a side effect, unregistered targets that simply show up because they polled the server for now are invisible in the REST interface. Modified: incubator/ace/trunk/ace-client-rest/src/main/java/org/apache/ace/client/rest/RESTClientServlet.java incubator/ace/trunk/ace-client-rest/src/main/java/org/apache/ace/client/rest/Workspace.java Modified: incubator/ace/trunk/ace-client-rest/src/main/java/org/apache/ace/client/rest/RESTClientServlet.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-rest/src/main/java/org/apache/ace/client/rest/RESTClientServlet.java?rev=1154177&r1=1154176&r2=1154177&view=diff ============================================================================== --- incubator/ace/trunk/ace-client-rest/src/main/java/org/apache/ace/client/rest/RESTClientServlet.java (original) +++ incubator/ace/trunk/ace-client-rest/src/main/java/org/apache/ace/client/rest/RESTClientServlet.java Fri Aug 5 11:46:54 2011 @@ -119,7 +119,9 @@ public class RESTClientServlet extends H JsonArray result = new JsonArray(); for (RepositoryObject ro : objects) { String identity = workspace.getRepositoryObjectIdentity(ro); - result.add(new JsonPrimitive(URLEncoder.encode(identity, "UTF-8"))); + if (identity != null) { + result.add(new JsonPrimitive(URLEncoder.encode(identity, "UTF-8"))); + } } resp.getWriter().println(m_gson.toJson(result)); return; @@ -203,7 +205,12 @@ public class RESTClientServlet extends H RepositoryValueObject data = m_gson.fromJson(req.getReader(), RepositoryValueObject.class); RepositoryObject object = workspace.addRepositoryObject(pathElements[2], data.attributes, data.tags); String identity = workspace.getRepositoryObjectIdentity(object); - resp.sendRedirect(buildPathFromElements(WORK_FOLDER, pathElements[1], pathElements[2], identity)); + if (identity != null) { + resp.sendRedirect(buildPathFromElements(WORK_FOLDER, pathElements[1], pathElements[2], identity)); + } + else { + // TODO decide what to do here, if this can happen at all + } return; } catch (IllegalArgumentException e) { Modified: incubator/ace/trunk/ace-client-rest/src/main/java/org/apache/ace/client/rest/Workspace.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-rest/src/main/java/org/apache/ace/client/rest/Workspace.java?rev=1154177&r1=1154176&r2=1154177&view=diff ============================================================================== --- incubator/ace/trunk/ace-client-rest/src/main/java/org/apache/ace/client/rest/Workspace.java (original) +++ incubator/ace/trunk/ace-client-rest/src/main/java/org/apache/ace/client/rest/Workspace.java Fri Aug 5 11:46:54 2011 @@ -160,7 +160,15 @@ public class Workspace { public static String getRepositoryObjectIdentity(RepositoryObject object) { if (object instanceof StatefulGatewayObject) { - return ((StatefulGatewayObject) object).getGatewayObject().getAssociationFilter(null); + StatefulGatewayObject statefulTarget = (StatefulGatewayObject) object; + if (statefulTarget.isRegistered()) { + return statefulTarget.getGatewayObject().getAssociationFilter(null); + } + else { + // TODO we're out of luck here, we cannot create an identity for the object + // based on the association filter + return null; + } } else { return object.getAssociationFilter(null);