Merge jv
authorMerge Script
Tue, 31 May 2016 06:46:06 +0200
branchjv
changeset 3853 a7a4481d6851
parent 3851 e9a1058f4ad9 (current diff)
parent 3852 9f672a905f2d (diff)
child 3855 312317e05660
Merge
ZipArchive.st
--- a/ZipArchive.st	Fri May 20 06:45:04 2016 +0200
+++ b/ZipArchive.st	Tue May 31 06:46:06 2016 +0200
@@ -3339,7 +3339,9 @@
     "initialize the archive to read from aPositionableStream"
 
     file notNil ifTrue: [
-        self closeFile.
+        file ~~ aPositionableStream ifTrue: [
+            self closeFile.
+        ].
     ].
 
     mode := #read.
@@ -3992,7 +3994,6 @@
     ^ false.
 ! !
 
-
 !ZipArchive methodsFor:'reading'!
 
 extract:fileName
@@ -4102,7 +4103,6 @@
     "Created: / 21-11-2010 / 11:51:41 / cg"
 ! !
 
-
 !ZipArchive methodsFor:'reading - stream'!
 
 extract:fileName intoStream: aWriteStream