&& => ||

apache · May 10, 2014 · 2e79b3d · 2e79b3d
1 parent 43621bd
commit 2e79b3d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/core/src/main/scala/org/apache/spark/util/collection/ExternalAppendOnlyMap.scala b/core/src/main/scala/org/apache/spark/util/collection/ExternalAppendOnlyMap.scala
@@ -76,10 +76,10 @@ class ExternalAppendOnlyMap[K, V, C](
   private val maxMemoryThreshold = {
     val memoryFraction = sparkConf.getDouble("spark.shuffle.memoryFraction", 0.3)
     val safetyFraction = sparkConf.getDouble("spark.shuffle.safetyFraction", 0.8)
-    if (memoryFraction > 1 && memoryFraction < 0) {
+    if (memoryFraction > 1 || memoryFraction < 0) {
       throw new IllegalArgumentException("spark.shuffle.memoryFraction should be between 0 and 1.")
     }
-    if (safetyFraction > 1 && safetyFraction < 0) {
+    if (safetyFraction > 1 || safetyFraction < 0) {
       throw new IllegalArgumentException("spark.shuffle.safetyFraction should be between 0 and 1.")
     }
     (Runtime.getRuntime.maxMemory * memoryFraction * safetyFraction).toLong