Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 36630 invoked from network); 1 Mar 2007 10:50:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 1 Mar 2007 10:50:44 -0000 Received: (qmail 48011 invoked by uid 500); 1 Mar 2007 10:50:53 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 47984 invoked by uid 500); 1 Mar 2007 10:50:52 -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 47975 invoked by uid 99); 1 Mar 2007 10:50:52 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Mar 2007 02:50:52 -0800 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Mar 2007 02:50:43 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 65D061A981A; Thu, 1 Mar 2007 02:50:23 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r513270 - in /jackrabbit/trunk/contrib/spi/spi2dav/src/main/java/org/apache/jackrabbit/spi2dav: ExceptionConverter.java IdFactoryImpl.java Date: Thu, 01 Mar 2007 10:50:23 -0000 To: commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070301105023.65D061A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: angela Date: Thu Mar 1 02:50:22 2007 New Revision: 513270 URL: http://svn.apache.org/viewvc?view=rev&rev=513270 Log: minor improvement convert precondition failed to LockException Modified: jackrabbit/trunk/contrib/spi/spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/ExceptionConverter.java jackrabbit/trunk/contrib/spi/spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/IdFactoryImpl.java Modified: jackrabbit/trunk/contrib/spi/spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/ExceptionConverter.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/ExceptionConverter.java?view=diff&rev=513270&r1=513269&r2=513270 ============================================================================== --- jackrabbit/trunk/contrib/spi/spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/ExceptionConverter.java (original) +++ jackrabbit/trunk/contrib/spi/spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/ExceptionConverter.java Thu Mar 1 02:50:22 2007 @@ -78,6 +78,7 @@ case DavServletResponse.SC_LOCKED : return new LockException(msg); case DavServletResponse.SC_METHOD_NOT_ALLOWED : return new ConstraintViolationException(msg); case DavServletResponse.SC_CONFLICT : return new InvalidItemStateException(msg); + case DavServletResponse.SC_PRECONDITION_FAILED : return new LockException(msg); default: return new RepositoryException(msg); } } Modified: jackrabbit/trunk/contrib/spi/spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/IdFactoryImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/IdFactoryImpl.java?view=diff&rev=513270&r1=513269&r2=513270 ============================================================================== --- jackrabbit/trunk/contrib/spi/spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/IdFactoryImpl.java (original) +++ jackrabbit/trunk/contrib/spi/spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/IdFactoryImpl.java Thu Mar 1 02:50:22 2007 @@ -122,8 +122,9 @@ } boolean equals(ItemId other) { - return (uniqueID == null ? other.getUniqueID() == null : uniqueID.equals(other.getUniqueID())) - && (path == null ? other.getPath() == null : path.equals(other.getPath())); + boolean equalUniqueID = (uniqueID == null) ? other.getUniqueID() == null : uniqueID.equals(other.getUniqueID()); + boolean equalPath = (path == null) ? other.getPath() == null : path.equals(other.getPath()); + return equalUniqueID && equalPath; } /** @@ -218,4 +219,4 @@ return false; } } -} \ No newline at end of file +}