From 49999bf609e29b85f86581c3cb4b02ad496edb84 Mon Sep 17 00:00:00 2001
From: Kelven Yang <kelven@cloud.com>
Date: Fri, 8 Jul 2011 09:54:15 -0700
Subject: [PATCH] bug 10618: another place that could possibly throw NPE

---
 .../cloud/storage/resource/NfsSecondaryStorageResource.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java b/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java
index 438ec3f6138..855ceb9b40c 100755
--- a/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java
+++ b/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java
@@ -192,7 +192,8 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
         }
         finally {
             try {
-                is.close();
+            	if(is != null)
+            		is.close();
             } catch (IOException e) {
                 if(s_logger.isDebugEnabled()){
                   s_logger.debug("Could not close the file " +absoluteTemplatePath);