From 43621bdb860ca588ed0ce87798994881ad4998af Mon Sep 17 00:00:00 2001
From: wangfei <scnbwf@yeah.net>
Date: Sat, 10 May 2014 16:18:34 +0800
Subject: [PATCH] && => ||

---
 core/src/main/scala/org/apache/spark/storage/BlockManager.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/scala/org/apache/spark/storage/BlockManager.scala b/core/src/main/scala/org/apache/spark/storage/BlockManager.scala
index 0256af8574783..feb89f4596485 100644
--- a/core/src/main/scala/org/apache/spark/storage/BlockManager.scala
+++ b/core/src/main/scala/org/apache/spark/storage/BlockManager.scala
@@ -1045,7 +1045,7 @@ private[spark] object BlockManager extends Logging {
 
   def getMaxMemory(conf: SparkConf): Long = {
     val memoryFraction = conf.getDouble("spark.storage.memoryFraction", 0.6)
-    if (memoryFraction > 1 && memoryFraction < 0) {
+    if (memoryFraction > 1 || memoryFraction < 0) {
       throw new IllegalArgumentException("spark.storage.memoryFraction should be between 0 and 1.")
     }
     (Runtime.getRuntime.maxMemory * memoryFraction).toLong