Revize fe28c174

#7794

U testovacích souborů od zákazníka potřeba jiného načítání - opraveno.

demo_mh/Deserializer/src/deserialize/ToJSON.java

@@ -9 +9 @@
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
+import java.util.zip.ZipFile;
 
 import org.json.simple.JSONObject;
 
@@ -60 +60 @@
 			Deserializer d = (Deserializer) ois.readObject();
 			System.out.println("Klasicka deserializace probehla v poradku.");
 			ois.close();
+			return true;
 			
 		} catch (IOException e) {
 			
@@ -67 +68 @@
 			System.out.println("Chyba pri otevirani (uzavirani) streamu pri pokusu o klasickou deserializaci.");
 			e.printStackTrace();
 			
-			return false;
-			
 		} catch (Exception e) {
 			
 			// Others: ClassNotFoundException, ClassCastException, ...
 			// Usually due to problems with classical deserialization.
-			return false;
 			
 		}
-		return true;
+		return false;
 	}
 	
 	private byte[] readByteArray() {
@@ -90 +88 @@
 		 *     50 4B 07 08 (spanned archive)
 		 * Source: https://en.wikipedia.org/wiki/List_of_file_signatures
 		 */
-		ZipInputStream zipInputStream = null;
+		ZipFile zipFile = null;
 		ZipEntry entry = null;
 	    try {
-	    	zipInputStream = new ZipInputStream(new FileInputStream(input));
-	    	entry = zipInputStream.getNextEntry();
-			System.out.println("Velikost ZIP dat je " + entry.getSize() + "B.");
+	    	zipFile = new ZipFile(input);
+	        entry = (ZipEntry) zipFile.entries().nextElement();
+	        System.out.println("Velikost ZIP dat je " + entry.getSize() + "B.");
 		} catch (Exception e) {
 			System.out.println("Soubor neni zazipovany...");
 		}
 	    
 	    try {
 	    	if (entry != null) {
-	    		//array = new byte[(int) entry.getSize()];
-				array = entry.getExtra();
-				System.out.println(array.length);
-	    		//zipInputStream.read(array);
-				zipInputStream.close();
+	    		array = new byte[(int) entry.getSize()];
+	    		zipFile.getInputStream(entry).read(array);
 		    } else {
 		    	array = new byte[(int) input.length()];
 				BufferedInputStream bis = new BufferedInputStream(new FileInputStream(input));