Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 11090 invoked from network); 17 Oct 2006 06:51:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 17 Oct 2006 06:51:25 -0000 Received: (qmail 64358 invoked by uid 500); 17 Oct 2006 06:51:25 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 64335 invoked by uid 500); 17 Oct 2006 06:51:25 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 64326 invoked by uid 99); 17 Oct 2006 06:51:25 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Oct 2006 23:51:25 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Oct 2006 23:51:24 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 4D5101A981D; Mon, 16 Oct 2006 23:51:03 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r464832 - /jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/util/ReferenceChangeTracker.java Date: Tue, 17 Oct 2006 06:51:03 -0000 To: commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061017065103.4D5101A981D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: angela Date: Mon Oct 16 23:51:01 2006 New Revision: 464832 URL: http://svn.apache.org/viewvc?view=rev&rev=464832 Log: work in progress - check if entry for old reference value exists Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/util/ReferenceChangeTracker.java Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/util/ReferenceChangeTracker.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/util/ReferenceChangeTracker.java?view=diff&rev=464832&r1=464831&r2=464832 ============================================================================== --- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/util/ReferenceChangeTracker.java (original) +++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/util/ReferenceChangeTracker.java Mon Oct 16 23:51:01 2006 @@ -88,8 +88,10 @@ if (oldReference.getType() == PropertyType.REFERENCE) { try { String oldValue = oldReference.getString(); - String newValue = uuidMap.get(oldValue).toString(); - remapped = QValue.create(newValue, PropertyType.REFERENCE); + if (uuidMap.containsKey(oldValue)) { + String newValue = uuidMap.get(oldValue).toString(); + remapped = QValue.create(newValue, PropertyType.REFERENCE); + } } catch (RepositoryException e) { log.error("Unexpected error while creating internal value.", e); }