baliuka 02/03/17 12:17:43
Modified: simplestore/src/java/org/apache/commons/simplestore/persistence/impl
DBStorage.java
simplestore/src/java/org/apache/commons/simplestore/tools
Enhancer.java
Log:
Fixed bug in enhancer
Revision Changes Path
1.13 +2 -4
jakarta-commons-sandbox/simplestore/src/java/org/apache/commons/simplestore/persistence/impl/DBStorage.java
Index: DBStorage.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/simplestore/src/java/org/apache/commons/simplestore/persistence/impl/DBStorage.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DBStorage.java 16 Mar 2002 18:55:45 -0000 1.12
+++ DBStorage.java 17 Mar 2002 20:17:43 -0000 1.13
@@ -86,7 +86,7 @@
/**
*@author Juozas Baliuka <a href="mailto:[EMAIL PROTECTED]";>
* [EMAIL PROTECTED]</a>
- *@version $Id: DBStorage.java,v 1.12 2002/03/16 18:55:45 baliuka Exp $
+ *@version $Id: DBStorage.java,v 1.13 2002/03/17 20:17:43 baliuka Exp $
*/
public class DBStorage extends AbstractStorage implements
org.apache.commons.simplestore.tools.Constants {
@@ -312,10 +312,8 @@
values.add(properties.getOID());
final String sql = "UPDATE " + name + " SET " + names;
+ excecute( sql, values.toArray(), null);
- if ( excecute( sql, values.toArray(), null) == 0 ) {
- throw new ObjectNotFound(properties.getOID().toString(), null);
- }
}
public void close() {
1.17 +5 -10
jakarta-commons-sandbox/simplestore/src/java/org/apache/commons/simplestore/tools/Enhancer.java
Index: Enhancer.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/simplestore/src/java/org/apache/commons/simplestore/tools/Enhancer.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Enhancer.java 16 Mar 2002 21:11:36 -0000 1.16
+++ Enhancer.java 17 Mar 2002 20:17:43 -0000 1.17
@@ -96,10 +96,11 @@
import org.apache.bcel.generic.RETURN;
import org.apache.bcel.generic.IFNULL;
import org.apache.bcel.generic.Type;
+import org.apache.bcel.generic.ArrayType;
/**
*@author Juozas Baliuka <a href="mailto:[EMAIL PROTECTED]";>
* [EMAIL PROTECTED]</a>
- *@version $Id: Enhancer.java,v 1.16 2002/03/16 21:11:36 baliuka Exp $
+ *@version $Id: Enhancer.java,v 1.17 2002/03/17 20:17:43 baliuka Exp $
*/
public class Enhancer implements org.apache.bcel.Constants , Constants{
@@ -492,14 +493,8 @@
il.append(new ALOAD(stack));
if (returnType instanceof ObjectType) {
if (!returnType.equals(Type.OBJECT)){
-
- IFNULL ifNull = new IFNULL(null);
- il.append(ifNull);
- il.append(new ALOAD(stack));
- il.append(new CHECKCAST(cp.addClass((ObjectType) returnType)));
- il.append(new ARETURN());
- ifNull.setTarget(il.append(new ACONST_NULL()));
- return il.append(new ARETURN());
+ il.append(new CHECKCAST(cp.addClass((ObjectType) returnType)));
+ return il.append(new ARETURN());
}else {
return il.append(new ARETURN());
}
@@ -674,7 +669,7 @@
return Type.BOOLEAN;
}
} else if (cls.isArray()) {
- return toType(cls.getComponentType());
+ return new ArrayType(
toType(cls.getComponentType()),cls.getName().lastIndexOf('[') + 1);
} else
return new ObjectType(cls.getName());
throw new java.lang.InternalError(cls.getName());
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
