Skip to content

Commit d494ffe

Browse files
committed
Fix deserialization of JavaSerializer instances.
This caused a failure in a new test; this problem occurs when calls ShuffledRDD.setSerializer() with a JavaSerializer.
1 parent 52a9981 commit d494ffe

File tree

2 files changed

+31
-0
lines changed

2 files changed

+31
-0
lines changed

core/src/main/scala/org/apache/spark/serializer/JavaSerializer.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,8 @@ class JavaSerializer(conf: SparkConf) extends Serializer with Externalizable {
121121
private var counterReset = conf.getInt("spark.serializer.objectStreamReset", 100)
122122
private var extraDebugInfo = conf.getBoolean("spark.serializer.extraDebugInfo", true)
123123

124+
protected def this() = this(new SparkConf()) // For deserialization only
125+
124126
override def newInstance(): SerializerInstance = {
125127
val classLoader = defaultClassLoader.getOrElse(Thread.currentThread.getContextClassLoader)
126128
new JavaSerializerInstance(counterReset, extraDebugInfo, classLoader)
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
package org.apache.spark.serializer
19+
20+
import org.apache.spark.SparkConf
21+
import org.scalatest.FunSuite
22+
23+
class JavaSerializerSuite extends FunSuite {
24+
test("JavaSerializer instances are serializable") {
25+
val serializer = new JavaSerializer(new SparkConf())
26+
val instance = serializer.newInstance()
27+
instance.deserialize[JavaSerializer](instance.serialize(serializer))
28+
}
29+
}

0 commit comments

Comments
 (0)