Return-Path: X-Original-To: apmail-empire-db-commits-archive@www.apache.org Delivered-To: apmail-empire-db-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 DB2429FCB for ; Fri, 16 Mar 2012 11:40:08 +0000 (UTC) Received: (qmail 73152 invoked by uid 500); 16 Mar 2012 11:40:08 -0000 Delivered-To: apmail-empire-db-commits-archive@empire-db.apache.org Received: (qmail 73131 invoked by uid 500); 16 Mar 2012 11:40:08 -0000 Mailing-List: contact commits-help@empire-db.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: empire-db-dev@empire-db.apache.org Delivered-To: mailing list commits@empire-db.apache.org Received: (qmail 73121 invoked by uid 99); 16 Mar 2012 11:40:08 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Mar 2012 11:40:08 +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, 16 Mar 2012 11:40:06 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 752372388993 for ; Fri, 16 Mar 2012 11:39:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1301443 - in /empire-db/trunk/empire-db/src/main/java/org/apache/empire: data/bean/BeanRecordProxy.java db/DBRecord.java Date: Fri, 16 Mar 2012 11:39:45 -0000 To: commits@empire-db.apache.org From: doebele@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120316113945.752372388993@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: doebele Date: Fri Mar 16 11:39:45 2012 New Revision: 1301443 URL: http://svn.apache.org/viewvc?rev=1301443&view=rev Log: EMPIREDB-137 reverted previous change (was not necessary) Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/data/bean/BeanRecordProxy.java empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRecord.java Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/data/bean/BeanRecordProxy.java URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/data/bean/BeanRecordProxy.java?rev=1301443&r1=1301442&r2=1301443&view=diff ============================================================================== --- empire-db/trunk/empire-db/src/main/java/org/apache/empire/data/bean/BeanRecordProxy.java (original) +++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/data/bean/BeanRecordProxy.java Fri Mar 16 11:39:45 2012 @@ -30,7 +30,6 @@ import org.apache.empire.commons.Options import org.apache.empire.data.Column; import org.apache.empire.data.ColumnExpr; import org.apache.empire.data.Record; -import org.apache.empire.db.DBRowSet; import org.apache.empire.exceptions.BeanPropertyGetException; import org.apache.empire.exceptions.BeanPropertySetException; import org.apache.empire.exceptions.InvalidArgumentException; @@ -157,8 +156,6 @@ public class BeanRecordProxy implemen public boolean isFieldReadOnly(Column column) { - if (isReadOnly()) - return true; if (isNew()==false && ObjectUtils.contains(keyColumns, column)) return true; if (column.isAutoGenerated()) Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRecord.java URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRecord.java?rev=1301443&r1=1301442&r2=1301443&view=diff ============================================================================== --- empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRecord.java (original) +++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRecord.java Fri Mar 16 11:39:45 2012 @@ -561,8 +561,6 @@ public class DBRecord extends DBRecordDa { if (rowset==null) throw new ObjectNotValidException(this); - if (isReadOnly()) - return true; // Ask RowSet return (rowset.isColumnReadOnly(column)); }