You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by cb...@apache.org on 2006/10/30 23:21:10 UTC

svn commit: r469297 - in /ibatis/trunk/java/mapper/mapper2: build/version.properties src/com/ibatis/common/jdbc/logging/PreparedStatementLogProxy.java src/com/ibatis/common/jdbc/logging/StatementLogProxy.java test/com/ibatis/sqlmap/DiscriminatorTest.java

Author: cbegin
Date: Mon Oct 30 14:21:09 2006
New Revision: 469297

URL: http://svn.apache.org/viewvc?view=rev&rev=469297
Log:
Removed autoboxing for JDK 1.4 support.

Modified:
    ibatis/trunk/java/mapper/mapper2/build/version.properties
    ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/PreparedStatementLogProxy.java
    ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/StatementLogProxy.java
    ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/DiscriminatorTest.java

Modified: ibatis/trunk/java/mapper/mapper2/build/version.properties
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/build/version.properties?view=diff&rev=469297&r1=469296&r2=469297
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/build/version.properties (original)
+++ ibatis/trunk/java/mapper/mapper2/build/version.properties Mon Oct 30 14:21:09 2006
@@ -1,5 +1,5 @@
 #Build version info
-#Sat Oct 28 23:25:57 MDT 2006
+#Mon Oct 30 15:17:27 MST 2006
 version=2.2.1
-buildDate=2006/10/28 23\:25
-buildNum=664
+buildDate=2006/10/30 15\:17
+buildNum=665

Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/PreparedStatementLogProxy.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/PreparedStatementLogProxy.java?view=diff&rev=469297&r1=469296&r2=469297
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/PreparedStatementLogProxy.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/PreparedStatementLogProxy.java Mon Oct 30 14:21:09 2006
@@ -79,11 +79,11 @@
       } else if ("equals".equals(method.getName())) {
         Object ps = params[0];
         if (ps instanceof Proxy) {
-          return proxy == ps;
+          return new Boolean(proxy == ps);
         }
-        return false;
+        return new Boolean(false);
       } else if ("hashCode".equals(method.getName())) {
-        return proxy.hashCode();
+        return new Integer(proxy.hashCode());
       } else {
         return method.invoke(statement, params);
       }

Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/StatementLogProxy.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/StatementLogProxy.java?view=diff&rev=469297&r1=469296&r2=469297
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/StatementLogProxy.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/StatementLogProxy.java Mon Oct 30 14:21:09 2006
@@ -67,11 +67,11 @@
       } else if ("equals".equals(method.getName())) {
         Object ps = params[0];
         if (ps instanceof Proxy) {
-          return proxy == ps;
+          return new Boolean(proxy == ps);
         }
-        return false;
+        return new Boolean(false);
       } else if ("hashCode".equals(method.getName())) {
-        return proxy.hashCode();
+        return new Integer(proxy.hashCode());
       } else {
         return method.invoke(statement, params);
       }

Modified: ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/DiscriminatorTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/DiscriminatorTest.java?view=diff&rev=469297&r1=469296&r2=469297
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/DiscriminatorTest.java (original)
+++ ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/DiscriminatorTest.java Mon Oct 30 14:21:09 2006
@@ -1,19 +1,12 @@
 package com.ibatis.sqlmap;
 
 import testdomain.Book;
-import testdomain.Magazine;
 import testdomain.Document;
+import testdomain.Magazine;
 import testdomain.PersonDocument;
 
 import java.util.List;
 
-/**
- * Created by IntelliJ IDEA.
- * User: cbegin
- * Date: May 14, 2005
- * Time: 1:19:54 AM
- * To change this template use File | Settings | File Templates.
- */
 public class DiscriminatorTest extends BaseSqlMapTest {
 
    protected void setUp() throws Exception {
@@ -82,4 +75,4 @@
     d = (Document) list.get(5);
     assertEquals(0, d.getAttributes().size());
   }
-}
+}
\ No newline at end of file