Merge changes from github.

Change: 155209832

1 files changed, 4 insertions, 0 deletions

diff --git a/tensorflow/python/summary/writer/writer_cache.py b/tensorflow/python/summary/writer/writer_cache.py
index 21870e788e..bad289303c 100644
--- a/tensorflow/python/summary/writer/writer_cache.py
+++ b/tensorflow/python/summary/writer/writer_cache.py
@@ -39,6 +39,10 @@ class FileWriterCache(object):
   def clear():
     """Clear cached summary writers. Currently only used for unit tests."""
     with FileWriterCache._lock:
+      # Make sure all the writers are closed now (otherwise open file handles
+      # may hang around, blocking deletions on Windows).
+      for item in FileWriterCache._cache.values():
+        item.close()
       FileWriterCache._cache = {}
 
   @staticmethod