From 4af8b23b465b2ad27e79b9352c7b97bd3d102cf7 Mon Sep 17 00:00:00 2001
From: Dmitry Litvintsev <litvinse@fnal.gov>
Date: Mon, 3 Nov 2014 10:29:53 -0600
Subject: [PATCH]    imera: protect against NPE in FsSqlDriver#read

    RB: https://rb.dcache.org/r/7385/
    Acked-by: Paul Millar
    Target: trunk
    Request: 2.11 2.10 2.9 2.8 2.7 2.6
(cherry picked from commit f1252364cceec877505eb98a736abcc984bc964e)
---
 .../chimera/src/main/java/org/dcache/chimera/FsSqlDriver.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/chimera/src/main/java/org/dcache/chimera/FsSqlDriver.java b/modules/chimera/src/main/java/org/dcache/chimera/FsSqlDriver.java
index 45d765c18b0..310d6a7cba1 100644
--- a/modules/chimera/src/main/java/org/dcache/chimera/FsSqlDriver.java
+++ b/modules/chimera/src/main/java/org/dcache/chimera/FsSqlDriver.java
@@ -1370,7 +1370,9 @@ int read(Connection dbConnection, FsInode inode, int level, long beginIndex, byt
 
             if (rs.next()) {
                 InputStream in = rs.getBinaryStream(1);
-
+                if (in == null) {
+                    return count;
+                }
                 in.skip(beginIndex);
                 int c;
                 while (((c = in.read()) != -1) && (count < len)) {