You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by an...@apache.org on 2015/02/11 05:19:16 UTC
spark git commit: [SPARK-5729] Potential NPE in standalone REST API
Repository: spark
Updated Branches:
refs/heads/master 1cb377007 -> b96918265
[SPARK-5729] Potential NPE in standalone REST API
If the user specifies a bad REST URL, the server will throw an NPE instead of propagating the error back. This is because the default `ErrorServlet` has the wrong prefix. This is a one line fix. I am will add more comprehensive tests in a separate patch.
Author: Andrew Or <an...@databricks.com>
Closes #4518 from andrewor14/rest-npe and squashes the following commits:
16b15bc [Andrew Or] Correct ErrorServlet context prefix
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/b9691826
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/b9691826
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/b9691826
Branch: refs/heads/master
Commit: b969182659aa7ea94c38329b86d98a31b23efce8
Parents: 1cb3770
Author: Andrew Or <an...@databricks.com>
Authored: Tue Feb 10 20:19:14 2015 -0800
Committer: Andrew Or <an...@databricks.com>
Committed: Tue Feb 10 20:19:14 2015 -0800
----------------------------------------------------------------------
.../scala/org/apache/spark/deploy/rest/StandaloneRestServer.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/b9691826/core/src/main/scala/org/apache/spark/deploy/rest/StandaloneRestServer.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/deploy/rest/StandaloneRestServer.scala b/core/src/main/scala/org/apache/spark/deploy/rest/StandaloneRestServer.scala
index 6e4486e..acd3a2b 100644
--- a/core/src/main/scala/org/apache/spark/deploy/rest/StandaloneRestServer.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/rest/StandaloneRestServer.scala
@@ -77,7 +77,7 @@ private[spark] class StandaloneRestServer(
new SubmitRequestServlet(masterActor, masterUrl, masterConf) -> s"$baseContext/create/*",
new KillRequestServlet(masterActor, masterConf) -> s"$baseContext/kill/*",
new StatusRequestServlet(masterActor, masterConf) -> s"$baseContext/status/*",
- new ErrorServlet -> "/" // default handler
+ new ErrorServlet -> "/*" // default handler
)
/** Start the server and return the bound port. */
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org