Fixes SPARK-8730 - Deser objects containing a primitive class attribute #7122
Conversation
|
Test build #36127 has finished for PR 7122 at commit
|
|
Test build #36128 has finished for PR 7122 at commit
|
| @@ -63,13 +63,30 @@ private[spark] class JavaDeserializationStream(in: InputStream, loader: ClassLoa | |||
|
|
|||
| private val objIn = new ObjectInputStream(in) { | |||
| override def resolveClass(desc: ObjectStreamClass): Class[_] = | |||
| Class.forName(desc.getName, false, loader) | |||
| try Class.forName(desc.getName, false, loader) | |||
There was a problem hiding this comment.
wrap the try block w/ braces eg
try {
Class.forName(...)
} catch {
...
|
Test build #38351 has finished for PR 7122 at commit
|
| } | ||
|
|
||
| def readObject[T: ClassTag](): T = objIn.readObject().asInstanceOf[T] | ||
| def close() { objIn.close() } | ||
| } | ||
|
|
||
| private object JavaSerDe { |
There was a problem hiding this comment.
can you rename this to match the class, JavaDeserializationStream? Alternatively we could give it some name which is more specific, eg. JavaSerializationPrimitiveClassHelper or something, but I think just making it a companion object is good enough.
There was a problem hiding this comment.
good point, I hesitated to do it at first but don't remember why I decided to not put it in a companion object. Will do
|
Test build #38394 has finished for PR 7122 at commit
|
|
@squito I don't get what fails. Is it some random issue or did I really break something? If I didn't should we just re run the tests? |
|
Test build #41828 has finished for PR 7122 at commit
|
|
@EugenCepoi yikes, sorry I forgot about this for so long! thanks for brining it up to date, merging to master |
|
Np, thanks for the review :) |
No description provided.