db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject cvs commit: jakarta-ojb/src/java/org/apache/ojb/broker/accesslayer JdbcAccess.java
Date Thu, 12 Dec 2002 20:17:49 GMT
thma        2002/12/12 12:17:49

  Modified:    src/java/org/apache/ojb/broker/query QueryFactory.java
               src/java/org/apache/ojb/broker/accesslayer JdbcAccess.java
  Log:
  fix #OJB110
  
  Revision  Changes    Path
  1.10      +2 -2      jakarta-ojb/src/java/org/apache/ojb/broker/query/QueryFactory.java
  
  Index: QueryFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/java/org/apache/ojb/broker/query/QueryFactory.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- QueryFactory.java	20 Sep 2002 17:17:16 -0000	1.9
  +++ QueryFactory.java	12 Dec 2002 20:17:48 -0000	1.10
  @@ -249,7 +249,7 @@
   			}
               else
               {
  -                concreteClassDiscriminator.addEqualTo(ClassDescriptor.OJB_CONCRETE_CLASS,
cld.getClassOfObject().getName());
  +                concreteClassDiscriminator.addEqualTo(ClassDescriptor.OJB_CONCRETE_CLASS,
classes.toArray()[0]);
               }    
   		}
   
  
  
  
  1.22      +3 -3      jakarta-ojb/src/java/org/apache/ojb/broker/accesslayer/JdbcAccess.java
  
  Index: JdbcAccess.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/java/org/apache/ojb/broker/accesslayer/JdbcAccess.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- JdbcAccess.java	14 Nov 2002 20:28:20 -0000	1.21
  +++ JdbcAccess.java	12 Dec 2002 20:17:49 -0000	1.22
  @@ -582,13 +582,13 @@
               case Types.CLOB :
                   {
                       java.sql.Clob aClob = rs.getClob(columnId);
  -                    result = aClob.getSubString(1L, (int) aClob.length());
  +                    result = ( rs.wasNull() ? null : aClob.getSubString(1L, (int) aClob.length())
);
                       break;
                   }
               case Types.BLOB :
                   {
                       java.sql.Blob aBlob = rs.getBlob(columnId);
  -                    result = aBlob.getBytes(1L, (int) aBlob.length());
  +                    result = ( rs.wasNull() ? null : aBlob.getBytes(1L, (int) aBlob.length())
);
                       break;
                   }
               default :
  
  
  

Mime
View raw message