Return-Path: X-Original-To: apmail-incubator-jena-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-jena-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 C03E29EBC for ; Fri, 4 Nov 2011 13:51:01 +0000 (UTC) Received: (qmail 90074 invoked by uid 500); 4 Nov 2011 13:51:01 -0000 Delivered-To: apmail-incubator-jena-commits-archive@incubator.apache.org Received: (qmail 90049 invoked by uid 500); 4 Nov 2011 13:51:01 -0000 Mailing-List: contact jena-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jena-dev@incubator.apache.org Delivered-To: mailing list jena-commits@incubator.apache.org Received: (qmail 90042 invoked by uid 99); 4 Nov 2011 13:51:01 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Nov 2011 13:51:01 +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, 04 Nov 2011 13:50:59 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7019B2388860; Fri, 4 Nov 2011 13:50:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1197567 - in /incubator/jena/Jena2/ARQ/trunk: src/main/java/com/hp/hpl/jena/sparql/engine/Rename.java testing/ARQ/manifest-arq.ttl Date: Fri, 04 Nov 2011 13:50:38 -0000 To: jena-commits@incubator.apache.org From: andy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111104135038.7019B2388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: andy Date: Fri Nov 4 13:50:37 2011 New Revision: 1197567 URL: http://svn.apache.org/viewvc?rev=1197567&view=rev Log: Make function implement it's documentation. Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/Rename.java incubator/jena/Jena2/ARQ/trunk/testing/ARQ/manifest-arq.ttl Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/Rename.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/Rename.java?rev=1197567&r1=1197566&r2=1197567&view=diff ============================================================================== --- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/Rename.java (original) +++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/Rename.java Fri Nov 4 13:50:37 2011 @@ -40,8 +40,9 @@ public class Rename public static Var chooseVarName(Var var, Collection inUse, String prefix) { Var var2 = var ; - for( ; inUse.contains(var2) ; ) + do { var2 = Var.alloc(prefix+var2.getName()) ; + } while (inUse.contains(var2)) ; return var2 ; } @@ -143,7 +144,7 @@ public class Rename // Really safe - use the global allocator. //var2 = allocator.allocVar() ; - var2 = Rename.chooseVarName(var2, constants, prefix) ; + var2 = Rename.chooseVarName(var, constants, prefix) ; aliases.put(var, var2) ; return var2 ; } Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/manifest-arq.ttl URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/manifest-arq.ttl?rev=1197567&r1=1197566&r2=1197567&view=diff ============================================================================== --- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/manifest-arq.ttl (original) +++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/manifest-arq.ttl Fri Nov 4 13:50:37 2011 @@ -25,7 +25,7 @@ - +