Trying to avoid thread deadlock when testing

TjWallas · Feb 6, 2015 · c2bb65b · c2bb65b
1 parent 9967332
commit c2bb65b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,3 @@
 language: java
 jdk:
-  - oraclejdk8
   - oraclejdk7
diff --git a/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java b/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java
@@ -52,7 +52,6 @@ public boolean isStopped() {
     }
     protected void stopCheck() throws IOException {
         if (shouldStop) {
-            threadPool.waitForThreads();
             throw new IOException("Ripping interrupted");
         }
     }

diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/VkRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/VkRipper.java
@@ -148,16 +148,15 @@ private void ripImages() throws IOException {
                 }
                 String url = photoIDsToURLs.get(photoID);
                 addURLToDownload(new URL(url));
+                if (isStopped() || isThisATest()) {
+                    break;
+                }
             }
-            logger.info("Received " + elements.size() + " elements");
-            if (elements.size() < 40) {
-                break;
-            }
-            offset += elements.size();
 
-            if (isStopped() || isThisATest()) {
+            if (elements.size() < 40 || isStopped() || isThisATest()) {
                 break;
             }
+            offset += elements.size();
         }
         waitForThreads();
     }

diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/VkRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/VkRipperTest.java
@@ -15,8 +15,8 @@ public void testVkAlbum() throws IOException {
         }
         List<URL> contentURLs = new ArrayList<URL>();
         contentURLs.add(new URL("https://vk.com/album45506334_172415053"));
-        //contentURLs.add(new URL("https://vk.com/album45506334_0"));
-        //contentURLs.add(new URL("https://vk.com/photos45506334"));
+        contentURLs.add(new URL("https://vk.com/album45506334_0"));
+        contentURLs.add(new URL("https://vk.com/photos45506334"));
         for (URL url : contentURLs) {
             VkRipper ripper = new VkRipper(url);
             testRipper(ripper);