6:42 p.m.
Author: shawkins
Date: 2009-08-10 12:42:31 -0400 (Mon, 10 Aug 2009)
New Revision: 1226
Modified:
trunk/common-internal/src/main/resources/com/metamatrix/common/i18n.properties
trunk/engine/src/main/java/com/metamatrix/common/lob/BufferManagerLobChunkStream.java
trunk/engine/src/main/java/org/teiid/dqp/internal/process/LobWorkItem.java
trunk/engine/src/main/resources/com/metamatrix/dqp/i18n.properties
Log:
TEIID-764 correcting missing message and potential npe with a missing lob tuplesource.
Modified: trunk/common-internal/src/main/resources/com/metamatrix/common/i18n.properties
===================================================================
---
trunk/common-internal/src/main/resources/com/metamatrix/common/i18n.properties 2009-08-09
17:35:28 UTC (rev 1225)
+++
trunk/common-internal/src/main/resources/com/metamatrix/common/i18n.properties 2009-08-10
16:42:31 UTC (rev 1226)
@@ -3085,12 +3085,6 @@
TraceLogger.exit=Exit -> {0}{1}.{2}()
ElapsedTimeAspect:timetook=Elapsed Time for {0}:{1} = {2} ms.
-
-buffermgr.can_not_save_lobs=Can not save *Reference Lobs* into peristent disk storage.
-
-BufferManagerLobChunkStream.no_tuple_source=Lob chunk is not found in the Buffer Manager
with tuple id {0}
-BufferManagerLobChunkStream.error_processing=Error occurred during the fetching of the
lob chunk from buffer manager with tuple id {0}
-
VDBArchiveSotRef.File_doesnt_exist=The Specified VDB Archive file does not exist at
location {0}
VDBArchiveSotRef.Unable_to_reead_file=Failed to read the specific file {0}
URIResource.Resource_not_found=Resource {0} could not be found or loaded in order to know
what type of model classes to entitle.
Modified:
trunk/engine/src/main/java/com/metamatrix/common/lob/BufferManagerLobChunkStream.java
===================================================================
---
trunk/engine/src/main/java/com/metamatrix/common/lob/BufferManagerLobChunkStream.java 2009-08-09
17:35:28 UTC (rev 1225)
+++
trunk/engine/src/main/java/com/metamatrix/common/lob/BufferManagerLobChunkStream.java 2009-08-10
16:42:31 UTC (rev 1226)
@@ -31,6 +31,7 @@
import com.metamatrix.common.buffer.TupleSourceID;
import com.metamatrix.common.buffer.TupleSourceNotFoundException;
import com.metamatrix.common.log.LogManager;
+import com.metamatrix.dqp.DQPPlugin;
import com.metamatrix.dqp.util.LogConstants;
public class BufferManagerLobChunkStream implements LobChunkProducer {
@@ -48,11 +49,11 @@
this.position++;
return bufferMgr.getStreamablePart(sourceId, position);
} catch (TupleSourceNotFoundException e) {
- String msg =
CommonPlugin.Util.getString("BufferManagerLobChunkStream.no_tuple_source", new
Object[] {sourceId}); //$NON-NLS-1$
+ String msg =
DQPPlugin.Util.getString("BufferManagerLobChunkStream.no_tuple_source", new
Object[] {sourceId}); //$NON-NLS-1$
LogManager.logWarning(LogConstants.CTX_BUFFER_MGR, e, msg);
throw new IOException(msg);
} catch (MetaMatrixComponentException e) {
- String msg =
CommonPlugin.Util.getString("BufferManagerLobChunkStream.error_processing", new
Object[] {sourceId}); //$NON-NLS-1$
+ String msg =
DQPPlugin.Util.getString("BufferManagerLobChunkStream.error_processing", new
Object[] {sourceId}); //$NON-NLS-1$
LogManager.logWarning(LogConstants.CTX_BUFFER_MGR, e, msg);
throw new IOException(msg);
}
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/LobWorkItem.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/LobWorkItem.java 2009-08-09
17:35:28 UTC (rev 1225)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/LobWorkItem.java 2009-08-10
16:42:31 UTC (rev 1226)
@@ -26,6 +26,7 @@
import java.util.List;
import com.metamatrix.api.exception.MetaMatrixComponentException;
+import com.metamatrix.common.CommonPlugin;
import com.metamatrix.common.buffer.BlockedOnMemoryException;
import com.metamatrix.common.buffer.MemoryNotAvailableException;
import com.metamatrix.common.buffer.TupleBatch;
@@ -104,7 +105,9 @@
if (shouldClose) {
try {
- stream.close();
+ if (stream != null) {
+ stream.close();
+ }
} catch (IOException e) {
LogManager.logWarning(LogConstants.CTX_DQP, e,
DQPPlugin.Util.getString("ProcessWorker.LobError")); //$NON-NLS-1$
}
Modified: trunk/engine/src/main/resources/com/metamatrix/dqp/i18n.properties
===================================================================
--- trunk/engine/src/main/resources/com/metamatrix/dqp/i18n.properties 2009-08-09 17:35:28
UTC (rev 1225)
+++ trunk/engine/src/main/resources/com/metamatrix/dqp/i18n.properties 2009-08-10 16:42:31
UTC (rev 1226)
@@ -468,4 +468,7 @@
connector_cache_closed=Connector cache has been already closed.
ConnectorEnvironmentImpl.request_scope_error=CacheScope.REQUEST not support on this
interface. Use methods on ExecutionContext for REQUEST scoped cache.
ConnectorEnvironmentImpl.session_scope_error=Session information is not available;
SESSION scoped cache can not be accessed.
-ConnectorEnvironmentImpl.vdb_scope_error=VDB information is not available; VDB scoped
cache can not be accessed.
\ No newline at end of file
+ConnectorEnvironmentImpl.vdb_scope_error=VDB information is not available; VDB scoped
cache can not be accessed.
+
+BufferManagerLobChunkStream.no_tuple_source=Lob chunk is not found in the Buffer Manager
with tuple id {0}
+BufferManagerLobChunkStream.error_processing=Error occurred during the fetching of the
lob chunk from buffer manager with tuple id {0}
\ No newline at end of file