[teiid-commits] teiid SVN: r3880 - in branches/7.7.x/runtime/src: test/java/org/teiid/dqp/service/buffer and 1 other directory.

Author: shawkins Date: 2012-02-14 12:22:52 -0500 (Tue, 14 Feb 2012) New Revision: 3880 Modified: branches/7.7.x/runtime/src/main/java/org/teiid/services/BufferServiceImpl.java branches/7.7.x/runtime/src/test/java/org/teiid/dqp/service/buffer/TestLocalBufferService.java Log: TEIID-1938 fix for propogating the inline lobs setting Modified: branches/7.7.x/runtime/src/main/java/org/teiid/services/BufferServiceImpl.java =================================================================== --- branches/7.7.x/runtime/src/main/java/org/teiid/services/BufferServiceImpl.java 2012-02-14 14:31:13 UTC (rev 3879) +++ branches/7.7.x/runtime/src/main/java/org/teiid/services/BufferServiceImpl.java 2012-02-14 17:22:52 UTC (rev 3880) @@ -94,6 +94,7 @@ this.bufferMgr.setProcessorBatchSize(Integer.valueOf(processorBatchSize)); this.bufferMgr.setMaxReserveKB(this.maxReserveKb); this.bufferMgr.setMaxProcessingKB(this.maxProcessingKb); + this.bufferMgr.setInlineLobs(inlineLobs); this.bufferMgr.initialize(); // If necessary, add disk storage manager Modified: branches/7.7.x/runtime/src/test/java/org/teiid/dqp/service/buffer/TestLocalBufferService.java =================================================================== --- branches/7.7.x/runtime/src/test/java/org/teiid/dqp/service/buffer/TestLocalBufferService.java 2012-02-14 14:31:13 UTC (rev 3879) +++ branches/7.7.x/runtime/src/test/java/org/teiid/dqp/service/buffer/TestLocalBufferService.java 2012-02-14 17:22:52 UTC (rev 3880) @@ -46,14 +46,14 @@ BufferServiceImpl svc = new BufferServiceImpl(); svc.setDiskDirectory(UnitTestUtil.getTestScratchPath()+"/teiid/1"); svc.setUseDisk(true); - + svc.setInlineLobs(false); svc.start(); // all the properties are set assertTrue("Not Directory", svc.getBufferDirectory().isDirectory()); //$NON-NLS-1$ assertTrue("does not exist", svc.getBufferDirectory().exists()); //$NON-NLS-1$ assertTrue("does not end with one", svc.getBufferDirectory().getParent().endsWith("1")); //$NON-NLS-1$ //$NON-NLS-2$ assertTrue(svc.isUseDisk()); - + assertFalse(svc.isInlineLobs()); BufferManagerImpl mgr = svc.getBufferManager(); SplittableStorageManager ssm = (SplittableStorageManager)((BufferFrontedFileStoreCache)mgr.getCache()).getStorageManager(); assertTrue(((FileStorageManager)ssm.getStorageManager()).getDirectory().endsWith(svc.getBufferDirectory().getName()));