Merge pull request #20839 from rallytime/bp-20608

Backport #20608 to 2014.7
2024-11-08 01:18:58 +00:00 · 2015-02-19 13:07:45 -07:00 · 2015-02-19 13:07:45 -07:00 · e0ba92f631
commit e0ba92f631
parent 2ef28c7e45 e4ced3e783
1 changed files with 2 additions and 1 deletions
--- a/salt/payload.py
+++ b/salt/payload.py
@ -105,7 +105,8 @@ class Serial(object):
        '''
        data = fn_.read()
        fn_.close()
-        return self.loads(data)
+        if data:
+            return self.loads(data)

    def dumps(self, msg):
        '''