From cd0dd134cc06ea26b51d968a18a507ebb3c59cee Mon Sep 17 00:00:00 2001
From: konsoletyper <konsoletyper@gmail.com>
Date: Thu, 12 Mar 2015 22:07:24 +0300
Subject: [PATCH] Preparing to merge into master

---
 teavm-samples/teavm-samples-async/pom.xml                     | 4 +---
 .../src/main/java/org/teavm/samples/async/AsyncProgram.java   | 2 +-
 .../test/java/org/teavm/classlib/java/lang/ObjectTest.java    | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/teavm-samples/teavm-samples-async/pom.xml b/teavm-samples/teavm-samples-async/pom.xml
index 125597036..99a38de06 100644
--- a/teavm-samples/teavm-samples-async/pom.xml
+++ b/teavm-samples/teavm-samples-async/pom.xml
@@ -65,12 +65,10 @@
               <targetDirectory>${project.build.directory}/generated/js/teavm</targetDirectory>
               <mainClass>org.teavm.samples.async.AsyncProgram</mainClass>
               <runtime>SEPARATE</runtime>
-              <minifying>false</minifying>
+              <minifying>true</minifying>
               <debugInformationGenerated>true</debugInformationGenerated>
-              <!-- 
               <sourceMapsGenerated>true</sourceMapsGenerated>
               <sourceFilesCopied>true</sourceFilesCopied>
-               -->
             </configuration>
           </execution>
         </executions>
diff --git a/teavm-samples/teavm-samples-async/src/main/java/org/teavm/samples/async/AsyncProgram.java b/teavm-samples/teavm-samples-async/src/main/java/org/teavm/samples/async/AsyncProgram.java
index e6888cc65..a7b116ab1 100644
--- a/teavm-samples/teavm-samples-async/src/main/java/org/teavm/samples/async/AsyncProgram.java
+++ b/teavm-samples/teavm-samples-async/src/main/java/org/teavm/samples/async/AsyncProgram.java
@@ -73,7 +73,7 @@ public final class AsyncProgram {
 
     private static void findPrimes() {
         report("Finding primes");
-        boolean[] prime = new boolean[1000000];
+        boolean[] prime = new boolean[1000];
         prime[2] = true;
         prime[3] = true;
         nextPrime: for (int i = 5; i < prime.length; i += 2) {
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/lang/ObjectTest.java b/teavm-tests/src/test/java/org/teavm/classlib/java/lang/ObjectTest.java
index 5bc565cd2..5aae01964 100644
--- a/teavm-tests/src/test/java/org/teavm/classlib/java/lang/ObjectTest.java
+++ b/teavm-tests/src/test/java/org/teavm/classlib/java/lang/ObjectTest.java
@@ -73,7 +73,7 @@ public class ObjectTest {
         long start = System.currentTimeMillis();
         final Object lock = new Object();
         synchronized (lock) {
-            lock.wait(100);
+            lock.wait(110);
         }
         long end = System.currentTimeMillis();
         assertTrue(end - start > 100);