Return-Path: Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: (qmail 74104 invoked from network); 16 Jun 2010 21:29:01 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 16 Jun 2010 21:29:01 -0000 Received: (qmail 49627 invoked by uid 500); 16 Jun 2010 21:29:01 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 49589 invoked by uid 500); 16 Jun 2010 21:29:01 -0000 Mailing-List: contact commits-help@openjpa.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openjpa.apache.org Delivered-To: mailing list commits@openjpa.apache.org Received: (qmail 49582 invoked by uid 99); 16 Jun 2010 21:29:01 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Jun 2010 21:29:01 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Wed, 16 Jun 2010 21:28:58 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 040F02388906; Wed, 16 Jun 2010 21:28:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r955400 - /openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java Date: Wed, 16 Jun 2010 21:28:11 -0000 To: commits@openjpa.apache.org From: faywang@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100616212812.040F02388906@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: faywang Date: Wed Jun 16 21:28:11 2010 New Revision: 955400 URL: http://svn.apache.org/viewvc?rev=955400&view=rev Log: OPENJPA-1699: clean up code Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java?rev=955400&r1=955399&r2=955400&view=diff ============================================================================== --- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java (original) +++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java Wed Jun 16 21:28:11 2010 @@ -1036,39 +1036,34 @@ public class DB2Dictionary } } } - + + @Override public void insertBlobForStreamingLoad(Row row, Column col, JDBCStore store, Object ob, Select sel) throws SQLException { if (ob != null) { - if (ob instanceof InputStream) { - InputStream is = (InputStream)ob; - row.setBinaryStream(col, is, -1); - } else - row.setBinaryStream(col, - new ByteArrayInputStream(new byte[0]), 0); + row.setBinaryStream(col, (InputStream)ob, -1); } else { row.setNull(col); } } + @Override public void insertClobForStreamingLoad(Row row, Column col, Object ob) throws SQLException { if (ob != null) { - if (ob instanceof Reader) { - row.setCharacterStream(col, (Reader)ob, -1); - } else - row.setCharacterStream(col, - new CharArrayReader(new char[0]), 0); + row.setCharacterStream(col, (Reader)ob, -1); } else { row.setNull(col); } } + @Override public void updateBlob(Select sel, JDBCStore store, InputStream is) throws SQLException { //NO-OP } + @Override public void updateClob(Select sel, JDBCStore store, Reader reader) throws SQLException { //NO-OP