[teiid-commits] teiid SVN: r2807 - in trunk/engine/src: test/java/org/teiid/common/buffer and 1 other directory.
Author: shawkins
Date: 2010-12-24 16:18:16 -0500 (Fri, 24 Dec 2010)
New Revision: 2807
Modified:
trunk/engine/src/main/java/org/teiid/common/buffer/LobManager.java
trunk/engine/src/test/java/org/teiid/common/buffer/TestLobManager.java
Log:
TEIID-1227 expanding the persistent check and ensuring that procedures with lob params are
not cached.
Modified: trunk/engine/src/main/java/org/teiid/common/buffer/LobManager.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/common/buffer/LobManager.java 2010-12-24 19:07:38
UTC (rev 2806)
+++ trunk/engine/src/main/java/org/teiid/common/buffer/LobManager.java 2010-12-24 21:18:16
UTC (rev 2807)
@@ -141,7 +141,7 @@
};
InputStream is = isf.getInputStream();
OutputStream fsos = store.createOutputStream();
- ObjectConverterUtil.write(fsos, is, bytes, -1);
+ length = ObjectConverterUtil.write(fsos, is, bytes, -1);
} catch (IOException e) {
throw new TeiidComponentException(e);
}
Modified: trunk/engine/src/test/java/org/teiid/common/buffer/TestLobManager.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/common/buffer/TestLobManager.java 2010-12-24
19:07:38 UTC (rev 2806)
+++ trunk/engine/src/test/java/org/teiid/common/buffer/TestLobManager.java 2010-12-24
21:18:16 UTC (rev 2807)
@@ -21,10 +21,8 @@
*/
package org.teiid.common.buffer;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
-import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.StringReader;
@@ -39,6 +37,7 @@
import org.teiid.core.types.ClobType;
import org.teiid.core.types.InputStreamFactory;
import org.teiid.core.types.Streamable;
+import org.teiid.core.util.ObjectConverterUtil;
import org.teiid.core.util.ReaderInputStream;
@SuppressWarnings("nls")
@@ -79,20 +78,8 @@
lob = lobManager.getLobReference(blob.getReferenceStreamId());
assertTrue(lob.getClass().isAssignableFrom(BlobType.class));
BlobType blobRead = (BlobType)lob;
- assertTrue(Arrays.equals(read(blob.getBinaryStream()),
read(blobRead.getBinaryStream())));
+ assertTrue(Arrays.equals(ObjectConverterUtil.convertToByteArray(blob.getBinaryStream()),
ObjectConverterUtil.convertToByteArray(blobRead.getBinaryStream())));
}
- private byte[] read(InputStream in) throws Exception {
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- byte[] bytes = new byte[100];
- while (true) {
- int c = in.read(bytes, 0, 100);
- if (c == -1) {
- break;
- }
- out.write(c);
- }
- return out.toByteArray();
- }
}